Skip to content

Commit bdf6efe

Browse files
hediethediet
authored
Merge branch 'main' into bug/diff-breakpoint-clash
2 parents c420cbd + dbac899 commit bdf6efe

File tree

798 files changed

+24082
-13466
lines changed

Some content is hidden

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

798 files changed

+24082
-13466
lines changed

‎.eslintrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@
222222
"@vscode/iconv-lite-umd",
223223
"@vscode/policy-watcher",
224224
"@vscode/proxy-agent",
225+
"@vscode/spdlog",
226+
"@vscode/windows-process-tree",
225227
"assert",
226228
"child_process",
227229
"console",
@@ -241,7 +243,6 @@
241243
"os",
242244
"path",
243245
"perf_hooks",
244-
"spdlog",
245246
"stream",
246247
"string_decoder",
247248
"tas-client-umd",
@@ -251,7 +252,6 @@
251252
"v8-inspect-profiler",
252253
"vscode-regexpp",
253254
"vscode-textmate",
254-
"windows-process-tree",
255255
"worker_threads",
256256
"xterm",
257257
"xterm-addon-canvas",

‎.github/classifier.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@
199199
"sash-widget": {"assign": ["joaomoreno"]},
200200
"scm": {"assign": ["lszomoru"]},
201201
"screencast-mode": {"assign": ["joaomoreno"]},
202-
"search": {"assign": ["andreamah"]},
203-
"search-api": {"assign": ["andreamah"]},
204-
"search-editor": {"assign": ["andreamah"]},
202+
"search": {"assign": ["andreamah", "roblourens"]},
203+
"search-api": {"assign": ["andreamah", "roblourens"]},
204+
"search-editor": {"assign": ["andreamah", "roblourens"]},
205205
"search-replace": {"assign": ["sandy081"]},
206206
"semantic-tokens": {"assign": ["alexdima", "aeschli"]},
207207
"server": {"assign": ["alexdima"]},

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ vscode.lsif
1616
vscode.db
1717
/.profile-oss
1818
/cli/target
19+
product.overrides.json

‎.vscode/extensions.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"recommendations": [
55
"dbaeumer.vscode-eslint",
66
"EditorConfig.EditorConfig",
7+
"GitHub.vscode-pull-request-github",
8+
"ms-vscode.vscode-github-issue-notebooks",
79
"ms-vscode.vscode-selfhost-test-provider"
810
]
911
}

‎.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@
526526
"name": "Monaco Editor Playground",
527527
"type": "chrome",
528528
"request": "launch",
529-
"url": "https://microsoft.github.io/monaco-editor/playground.html?source=http%3A%2F%2Flocalhost%3A5001%2Fout%2Fvs",
529+
"url": "http://localhost:5001",
530530
"preLaunchTask": "Launch Http Server",
531531
"presentation": {
532532
"group": "monaco",

‎.vscode/notebooks/my-endgame.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,6 @@
177177
{
178178
"kind": 2,
179179
"language": "github-issues",
180-
"value": "repo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:on-release-notes\nrepo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:engineering -label:on-release-notes"
180+
"value": "repo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:on-release-notes\nrepo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:engineering -label:on-release-notes\nrepo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:plan-item -label:on-release-notes"
181181
}
182182
]

‎.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,5 @@
125125
],
126126
"application.experimental.rendererProfiling": true,
127127
"editor.experimental.asyncTokenization": true,
128-
"diffEditor.diffAlgorithm": "experimental"
128+
"editor.experimental.asyncTokenizationVerification": true
129129
}

‎.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
// Used for monaco editor playground launch config
261261
"label": "Launch Http Server",
262262
"type": "shell",
263-
"command": "node_modules/.bin/http-server --cors --port 5001 -a 127.0.0.1 -c-1 -s",
263+
"command": "node_modules/.bin/ts-node -T ./scripts/playground-server",
264264
"isBackground": true,
265265
"problemMatcher": {
266266
"pattern": {

‎.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
disturl "https://electronjs.org/headers"
2-
target "22.3.3"
2+
target "22.3.5"
33
runtime "electron"
44
build_from_source "true"

‎build/.moduleignore

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ fsevents/src/**
1212
fsevents/test/**
1313
!fsevents/**/*.node
1414

15+
@vscode/spdlog/binding.gyp
16+
@vscode/spdlog/build/**
17+
@vscode/spdlog/deps/**
18+
@vscode/spdlog/src/**
19+
@vscode/spdlog/test/**
20+
@vscode/spdlog/*.yml
21+
!@vscode/spdlog/build/Release/*.node
22+
1523
@vscode/sqlite3/binding.gyp
1624
@vscode/sqlite3/benchmark/**
1725
@vscode/sqlite3/cloudformation/**
@@ -21,16 +29,21 @@ fsevents/test/**
2129
@vscode/sqlite3/src/**
2230
!@vscode/sqlite3/build/Release/*.node
2331

32+
@vscode/windows-mutex/binding.gyp
33+
@vscode/windows-mutex/build/**
34+
@vscode/windows-mutex/src/**
35+
!@vscode/windows-mutex/**/*.node
36+
37+
@vscode/windows-process-tree/binding.gyp
38+
@vscode/windows-process-tree/build/**
39+
@vscode/windows-process-tree/src/**
40+
!@vscode/windows-process-tree/**/*.node
41+
2442
@vscode/windows-registry/binding.gyp
2543
@vscode/windows-registry/src/**
2644
@vscode/windows-registry/build/**
2745
!@vscode/windows-registry/build/Release/*.node
2846

29-
windows-mutex/binding.gyp
30-
windows-mutex/build/**
31-
windows-mutex/src/**
32-
!windows-mutex/**/*.node
33-
3447
native-keymap/binding.gyp
3548
native-keymap/build/**
3649
native-keymap/src/**
@@ -53,24 +66,11 @@ node-vsce-sign/**
5366
!node-vsce-sign/package.json
5467
!node-vsce-sign/bin/**
5568

56-
spdlog/binding.gyp
57-
spdlog/build/**
58-
spdlog/deps/**
59-
spdlog/src/**
60-
spdlog/test/**
61-
spdlog/*.yml
62-
!spdlog/build/Release/*.node
63-
6469
windows-foreground-love/binding.gyp
6570
windows-foreground-love/build/**
6671
windows-foreground-love/src/**
6772
!windows-foreground-love/**/*.node
6873

69-
windows-process-tree/binding.gyp
70-
windows-process-tree/build/**
71-
windows-process-tree/src/**
72-
!windows-process-tree/**/*.node
73-
7474
keytar/binding.gyp
7575
keytar/build/**
7676
keytar/src/**

0 commit comments

Comments
 (0)