Skip to content

Commit bc4945e

Browse files
alexdimaalexdima
committed
Merge remote-tracking branch 'origin/main' into pr/byteit101/134171
2 parents 3e5ddbf + 9264622 commit bc4945e

File tree

1,152 files changed

+31571
-13428
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,152 files changed

+31571
-13428
lines changed

‎.eslintrc.json

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"no-duplicate-case": "warn",
2121
"no-duplicate-imports": "warn",
2222
"no-eval": "warn",
23+
"no-async-promise-executor": "warn",
2324
"no-extra-semi": "warn",
2425
"no-new-wrappers": "warn",
2526
"no-redeclare": "off",
@@ -132,7 +133,7 @@
132133
"restrictions": [
133134
"vs/nls",
134135
"**/vs/base/{common,node}/**",
135-
"@vscode/*", "*" // node modules
136+
"@vscode/*", "@parcel/*", "*" // node modules
136137
]
137138
},
138139
{
@@ -170,7 +171,7 @@
170171
"vs/nls",
171172
"**/vs/base/{common,node}/**",
172173
"**/vs/base/parts/*/{common,node}/**",
173-
"@vscode/*", "*" // node modules
174+
"@vscode/*", "@parcel/*", "*" // node modules
174175
]
175176
},
176177
{
@@ -189,7 +190,7 @@
189190
"vs/css!./**/*",
190191
"**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
191192
"**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
192-
"@vscode/*", "*" // node modules
193+
"@vscode/*", "@parcel/*", "*" // node modules
193194
]
194195
},
195196
{
@@ -198,7 +199,7 @@
198199
"vs/nls",
199200
"**/vs/base/{common,node,electron-main}/**",
200201
"**/vs/base/parts/*/{common,node,electron-main}/**",
201-
"@vscode/*", "*" // node modules
202+
"@vscode/*", "@parcel/*", "*" // node modules
202203
]
203204
},
204205
{
@@ -255,7 +256,7 @@
255256
"**/vs/base/{common,node}/**",
256257
"**/vs/base/parts/*/{common,node}/**",
257258
"**/vs/platform/*/{common,node}/**",
258-
"@vscode/*", "*" // node modules
259+
"@vscode/*", "@parcel/*", "*" // node modules
259260
]
260261
},
261262
{
@@ -276,7 +277,7 @@
276277
"**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
277278
"**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
278279
"**/vs/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
279-
"@vscode/*", "*" // node modules
280+
"@vscode/*", "@parcel/*", "*" // node modules
280281
]
281282
},
282283
{
@@ -286,7 +287,7 @@
286287
"**/vs/base/{common,node,electron-main}/**",
287288
"**/vs/base/parts/*/{common,node,electron-main}/**",
288289
"**/vs/platform/*/{common,node,electron-main}/**",
289-
"@vscode/*", "*" // node modules
290+
"@vscode/*", "@parcel/*", "*" // node modules
290291
]
291292
},
292293
{
@@ -513,7 +514,7 @@
513514
"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
514515
"**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
515516
"**/vs/workbench/services/*/{common,browser,node,electron-sandbox,electron-browser}/**",
516-
"@vscode/*", "*" // node modules
517+
"@vscode/*", "@parcel/*", "*" // node modules
517518
]
518519
},
519520
{
@@ -528,7 +529,7 @@
528529
"vs/workbench/contrib/files/browser/editors/fileEditorInput",
529530
"**/vs/workbench/services/**",
530531
"**/vs/workbench/test/**",
531-
"@vscode/*", "*" // node modules
532+
"@vscode/*", "@parcel/*", "*" // node modules
532533
]
533534
},
534535
{
@@ -592,7 +593,7 @@
592593
"**/vs/workbench/{common,node}/**",
593594
"**/vs/workbench/api/{common,node}/**",
594595
"**/vs/workbench/services/**/{common,node}/**",
595-
"@vscode/*", "*" // node modules
596+
"@vscode/*", "@parcel/*", "*" // node modules
596597
]
597598
},
598599
{
@@ -623,7 +624,7 @@
623624
"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
624625
"**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
625626
"**/vs/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
626-
"@vscode/*", "*" // node modules
627+
"@vscode/*", "@parcel/*", "*" // node modules
627628
]
628629
},
629630
{
@@ -742,7 +743,7 @@
742743
"**/vs/workbench/api/{common,node}/**",
743744
"**/vs/workbench/services/**/{common,node}/**",
744745
"**/vs/workbench/contrib/**/{common,node}/**",
745-
"@vscode/*", "*" // node modules
746+
"@vscode/*", "@parcel/*", "*" // node modules
746747
]
747748
},
748749
{
@@ -775,7 +776,7 @@
775776
"**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
776777
"**/vs/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
777778
"**/vs/workbench/contrib/**/{common,browser,node,electron-sandbox,electron-browser}/**",
778-
"@vscode/*", "*" // node modules
779+
"@vscode/*", "@parcel/*", "*" // node modules
779780
]
780781
},
781782
{
@@ -798,7 +799,7 @@
798799
"**/vs/base/parts/**/{common,node}/**",
799800
"**/vs/platform/**/{common,node}/**",
800801
"**/vs/code/**/{common,node}/**",
801-
"@vscode/*", "*" // node modules
802+
"@vscode/*", "@parcel/*", "*" // node modules
802803
]
803804
},
804805
{
@@ -810,7 +811,7 @@
810811
"**/vs/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
811812
"**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
812813
"**/vs/code/**/{common,browser,node,electron-sandbox,electron-browser}/**",
813-
"@vscode/*", "*" // node modules
814+
"@vscode/*", "@parcel/*", "*" // node modules
814815
]
815816
},
816817
{
@@ -821,7 +822,7 @@
821822
"**/vs/base/parts/**/{common,node,electron-main}/**",
822823
"**/vs/platform/**/{common,node,electron-main}/**",
823824
"**/vs/code/**/{common,node,electron-main}/**",
824-
"@vscode/*", "*" // node modules
825+
"@vscode/*", "@parcel/*", "*" // node modules
825826
]
826827
},
827828
{
@@ -833,7 +834,7 @@
833834
"**/vs/platform/**/{common,node}/**",
834835
"**/vs/workbench/**/{common,node}/**",
835836
"**/vs/server/**",
836-
"@vscode/*", "*" // node modules
837+
"@vscode/*", "@parcel/*", "*" // node modules
837838
]
838839
},
839840
{
@@ -904,28 +905,28 @@
904905
"target": "**/test/smoke/**",
905906
"restrictions": [
906907
"**/test/smoke/**",
907-
"@vscode/*", "*" // node modules
908+
"@vscode/*", "@parcel/*", "*" // node modules
908909
]
909910
},
910911
{
911912
"target": "**/test/automation/**",
912913
"restrictions": [
913914
"**/test/automation/**",
914-
"@vscode/*", "*" // node modules
915+
"@vscode/*", "@parcel/*", "*" // node modules
915916
]
916917
},
917918
{
918919
"target": "**/test/integration/**",
919920
"restrictions": [
920921
"**/test/integration/**",
921-
"@vscode/*", "*" // node modules
922+
"@vscode/*", "@parcel/*", "*" // node modules
922923
]
923924
},
924925
{
925926
"target": "**/test/monaco/**",
926927
"restrictions": [
927928
"**/test/monaco/**",
928-
"@vscode/*", "*" // node modules
929+
"@vscode/*", "@parcel/*", "*" // node modules
929930
]
930931
},
931932
{
@@ -943,21 +944,21 @@
943944
"target": "**/{node,electron-browser,electron-main}/**/*.test.ts",
944945
"restrictions": [
945946
"**/vs/**",
946-
"@vscode/*", "*" // node modules
947+
"@vscode/*", "@parcel/*", "*" // node modules
947948
]
948949
},
949950
{
950951
"target": "**/{node,electron-browser,electron-main}/**/test/**",
951952
"restrictions": [
952953
"**/vs/**",
953-
"@vscode/*", "*" // node modules
954+
"@vscode/*", "@parcel/*", "*" // node modules
954955
]
955956
},
956957
{
957958
"target": "**/test/{node,electron-browser,electron-main}/**",
958959
"restrictions": [
959960
"**/vs/**",
960-
"@vscode/*", "*" // node modules
961+
"@vscode/*", "@parcel/*", "*" // node modules
961962
]
962963
},
963964
{
@@ -1070,17 +1071,6 @@
10701071
}
10711072
]
10721073
}
1073-
},
1074-
{
1075-
"files": [
1076-
"src/vs/server/*"
1077-
],
1078-
"rules": {
1079-
"header/header": [
1080-
// hygiene.js still checks that all files (even those in this directory) are MIT licensed.
1081-
"off"
1082-
]
1083-
}
10841074
}
10851075
]
10861076
}

‎.github/classifier.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/master/classifier-deep/apply/apply-labels/deep-classifier-config.schema.json",
3-
"vacation": ["RMacfarlane"],
3+
"vacation": ["RMacfarlane", "eamodio"],
44
"assignees": {
55
"JacksonKearl": {"accuracy": 0.5}
66
},
@@ -21,7 +21,7 @@
2121
"context-keys": {"assign": []},
2222
"css-less-scss": {"assign": ["aeschli"]},
2323
"custom-editors": {"assign": ["mjbvz"]},
24-
"debug": {"assign": ["roblourens"]},
24+
"debug": {"assign": ["weinand"]},
2525
"dialogs": {"assign": ["sbatten"]},
2626
"diff-editor": {"assign": []},
2727
"dropdown": {"assign": []},
@@ -72,7 +72,7 @@
7272
"file-watcher": {"assign": ["bpasero"]},
7373
"font-rendering": {"assign": []},
7474
"formatting": {"assign": []},
75-
"git": {"assign": ["eamodio"]},
75+
"git": {"assign": ["lszomoru"]},
7676
"gpu": {"assign": ["deepak1556"]},
7777
"grammar": {"assign": ["mjbvz"]},
7878
"grid-view": {"assign": ["joaomoreno"]},
@@ -120,13 +120,13 @@
120120
"remote": {"assign": []},
121121
"remote-explorer": {"assign": ["alexr00"]},
122122
"rename": {"assign": ["jrieken"]},
123-
"scm": {"assign": ["eamodio"]},
123+
"scm": {"assign": ["lszomoru"]},
124124
"screencast-mode": {"assign": ["lszomoru"]},
125125
"search": {"assign": ["roblourens"]},
126126
"search-editor": {"assign": ["JacksonKearl"]},
127127
"search-replace": {"assign": ["sandy081"]},
128128
"semantic-tokens": {"assign": ["aeschli"]},
129-
"settings-editor": {"assign": ["roblourens"]},
129+
"settings-editor": {"assign": ["rzhao271"]},
130130
"settings-sync": {"assign": ["sandy081"]},
131131
"simple-file-dialog": {"assign": ["alexr00"]},
132132
"smart-select": {"assign": ["jrieken"]},
@@ -138,8 +138,8 @@
138138
"tasks": {"assign": ["alexr00"], "accuracy": 0.85},
139139
"telemetry": {"assign": []},
140140
"themes": {"assign": ["aeschli"]},
141-
"timeline": {"assign": ["eamodio"]},
142-
"timeline-git": {"assign": ["eamodio"]},
141+
"timeline": {"assign": ["JacksonKearl"]},
142+
"timeline-git": {"assign": ["lszomoru"]},
143143
"titlebar": {"assign": ["sbatten"]},
144144
"tokenization": {"assign": []},
145145
"tree": {"assign": ["joaomoreno"]},

‎.github/commands.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,18 @@
6868
{
6969
"type": "label",
7070
"name": "notebook",
71+
"regex": "notebook.*",
7172
"assign": [
7273
"rebornix"
7374
]
7475
},
76+
{
77+
"type": "label",
78+
"name": "notebook-triage",
79+
"regex": "notebook.*",
80+
"action": "updateLabels",
81+
"addLabel": "notebook-triage"
82+
},
7583
{
7684
"type": "label",
7785
"name": "L10N",

‎.github/subscribers.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"donjayamanne",
77
"jilljac",
88
"IanMatthewHuff",
9-
"tanhakabir",
109
"dynamicwebpaige"
1110
]
1211
}

‎.github/workflows/create-codespaces-prebuild.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,15 @@ jobs:
2626
sku_name: standardLinux32gb
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29+
createPrebuildDev:
30+
runs-on: ubuntu-latest
31+
steps:
32+
- uses: actions/checkout@v2
33+
- uses: github/[email protected]
34+
with:
35+
target: development
36+
regions: WestUs2
37+
sku_name: standardLinux32gb
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+

‎.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ node_modules/
77
extensions/**/dist/
88
/out*/
99
/extensions/**/out/
10-
src/vs/server
11-
resources/server
1210
build/node_modules
1311
coverage/
1412
test_data/

‎.vscode/launch.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,6 @@
226226
"runtimeArgs": [
227227
"--inspect=5875",
228228
"--no-cached-data",
229-
// for breakpoint freeze: https://github.com/microsoft/vscode/issues/122225#issuecomment-885377304
230-
"--js-flags=\"--regexp_interpret_all\"",
231229
// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
232230
"--disable-features=CalculateNativeWinOcclusion",
233231
],

‎.vscode/notebooks/api.github-issues

Lines changed: 1 addition & 1 deletion
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 2021\""
10+
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"October 2021\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/endgame.github-issues

Lines changed: 21 additions & 1 deletion
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/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"September 2021\""
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"October 2021\""
1111
},
1212
{
1313
"kind": 1,
@@ -24,6 +24,26 @@
2424
"language": "github-issues",
2525
"value": "$REPOS $MILESTONE is:pr is:open"
2626
},
27+
{
28+
"kind": 1,
29+
"language": "markdown",
30+
"value": "## Unverified Older Insiders-Released Issues"
31+
},
32+
{
33+
"kind": 2,
34+
"language": "github-issues",
35+
"value": "$REPOS -$MILESTONE is:issue is:closed label:bug label:insiders-released -label:verified -label:*duplicate -label:*as-designed -label:z-author-verified -label:on-testplan"
36+
},
37+
{
38+
"kind": 1,
39+
"language": "markdown",
40+
"value": "## Unverified Older Insiders-Released Feature Requests"
41+
},
42+
{
43+
"kind": 2,
44+
"language": "github-issues",
45+
"value": "$REPOS -$MILESTONE is:issue is:closed label:feature-request label:insiders-released -label:on-testplan -label:verified -label:*duplicate"
46+
},
2747
{
2848
"kind": 1,
2949
"language": "markdown",

0 commit comments

Comments
 (0)