Skip to content

Commit fc574fb

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into joao/win32-arm64
2 parents 07e8e50 + 64c4407 commit fc574fb

260 files changed

Lines changed: 2872 additions & 1386 deletions

File tree

Some content is hidden

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

‎.eslintrc.json‎

Lines changed: 153 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,18 @@
6363
"browser": [
6464
"common"
6565
],
66-
"electron-main": [
66+
"electron-sandbox": [
6767
"common",
68-
"node"
68+
"browser"
6969
],
7070
"electron-browser": [
7171
"common",
7272
"browser",
73+
"node",
74+
"electron-sandbox"
75+
],
76+
"electron-main": [
77+
"common",
7378
"node"
7479
]
7580
}
@@ -104,6 +109,14 @@
104109
"**/vs/base/{common,browser}/**"
105110
]
106111
},
112+
{
113+
"target": "**/vs/base/electron-sandbox/**",
114+
"restrictions": [
115+
"vs/nls",
116+
"vs/css!./**/*",
117+
"**/vs/base/{common,browser,electron-sandbox}/**"
118+
]
119+
},
107120
{
108121
"target": "**/vs/base/node/**",
109122
"restrictions": [
@@ -149,13 +162,22 @@
149162
"*" // node modules
150163
]
151164
},
165+
{
166+
"target": "**/vs/base/parts/*/electron-sandbox/**",
167+
"restrictions": [
168+
"vs/nls",
169+
"vs/css!./**/*",
170+
"**/vs/base/{common,browser,electron-sandbox}/**",
171+
"**/vs/base/parts/*/{common,browser,electron-sandbox}/**"
172+
]
173+
},
152174
{
153175
"target": "**/vs/base/parts/*/electron-browser/**",
154176
"restrictions": [
155177
"vs/nls",
156178
"vs/css!./**/*",
157-
"**/vs/base/{common,browser,node,electron-browser}/**",
158-
"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
179+
"**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
180+
"**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
159181
"*" // node modules
160182
]
161183
},
@@ -210,14 +232,24 @@
210232
"*" // node modules
211233
]
212234
},
235+
{
236+
"target": "**/vs/platform/*/electron-sandbox/**",
237+
"restrictions": [
238+
"vs/nls",
239+
"vs/css!./**/*",
240+
"**/vs/base/{common,browser,electron-sandbox}/**",
241+
"**/vs/base/parts/*/{common,browser,electron-sandbox}/**",
242+
"**/vs/platform/*/{common,browser,electron-sandbox}/**"
243+
]
244+
},
213245
{
214246
"target": "**/vs/platform/*/electron-browser/**",
215247
"restrictions": [
216248
"vs/nls",
217249
"vs/css!./**/*",
218-
"**/vs/base/{common,browser,node}/**",
219-
"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
220-
"**/vs/platform/*/{common,browser,node,electron-browser}/**",
250+
"**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
251+
"**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
252+
"**/vs/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
221253
"*" // node modules
222254
]
223255
},
@@ -421,18 +453,34 @@
421453
"**/vs/**/{common,worker}/**"
422454
]
423455
},
456+
{
457+
"target": "**/vs/workbench/electron-sandbox/**",
458+
"restrictions": [
459+
"vs/nls",
460+
"vs/css!./**/*",
461+
"**/vs/base/{common,browser,electron-sandbox}/**",
462+
"**/vs/base/parts/*/{common,browser,electron-sandbox}/**",
463+
"**/vs/platform/*/{common,browser,electron-sandbox}/**",
464+
"**/vs/editor/{common,browser,electron-sandbox}/**",
465+
"**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
466+
"**/vs/workbench/{common,browser,electron-sandbox}/**",
467+
"**/vs/workbench/api/{common,browser,electron-sandbox}/**",
468+
"**/vs/workbench/services/*/{common,browser,electron-sandbox}/**"
469+
]
470+
},
424471
{
425472
"target": "**/vs/workbench/electron-browser/**",
426473
"restrictions": [
427474
"vs/nls",
428475
"vs/css!./**/*",
429-
"**/vs/base/{common,browser,node,electron-browser}/**",
430-
"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
431-
"**/vs/platform/*/{common,browser,node,electron-browser}/**",
432-
"**/vs/editor/{common,browser,node,electron-browser}/**",
476+
"**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
477+
"**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
478+
"**/vs/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
479+
"**/vs/editor/{common,browser,node,electron-sandbox,electron-browser}/**",
433480
"**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
434-
"**/vs/workbench/{common,browser,node,electron-browser,api}/**",
435-
"**/vs/workbench/services/*/{common,browser,node,electron-browser}/**",
481+
"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
482+
"**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
483+
"**/vs/workbench/services/*/{common,browser,node,electron-sandbox,electron-browser}/**",
436484
"*" // node modules
437485
]
438486
},
@@ -444,7 +492,7 @@
444492
"**/vs/base/**",
445493
"**/vs/platform/**",
446494
"**/vs/editor/**",
447-
"**/vs/workbench/{common,browser,node,electron-browser}/**",
495+
"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
448496
"vs/workbench/contrib/files/common/editors/fileEditorInput",
449497
"**/vs/workbench/services/**",
450498
"**/vs/workbench/test/**",
@@ -508,16 +556,30 @@
508556
"*" // node modules
509557
]
510558
},
559+
{
560+
"target": "**/vs/workbench/services/**/electron-sandbox/**",
561+
"restrictions": [
562+
"vs/nls",
563+
"vs/css!./**/*",
564+
"**/vs/base/**/{common,browser,worker,electron-sandbox}/**",
565+
"**/vs/platform/**/{common,browser,electron-sandbox}/**",
566+
"**/vs/editor/**",
567+
"**/vs/workbench/{common,browser,electron-sandbox}/**",
568+
"**/vs/workbench/api/{common,browser,electron-sandbox}/**",
569+
"**/vs/workbench/services/**/{common,browser,electron-sandbox}/**"
570+
]
571+
},
511572
{
512573
"target": "**/vs/workbench/services/**/electron-browser/**",
513574
"restrictions": [
514575
"vs/nls",
515576
"vs/css!./**/*",
516-
"**/vs/base/**/{common,browser,worker,node,electron-browser}/**",
517-
"**/vs/platform/**/{common,browser,node,electron-browser}/**",
577+
"**/vs/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**",
578+
"**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
518579
"**/vs/editor/**",
519-
"**/vs/workbench/{common,browser,node,electron-browser,api}/**",
520-
"**/vs/workbench/services/**/{common,browser,node,electron-browser}/**",
580+
"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
581+
"**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
582+
"**/vs/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
521583
"*" // node modules
522584
]
523585
},
@@ -530,7 +592,7 @@
530592
"**/vs/base/**",
531593
"**/vs/platform/**",
532594
"**/vs/editor/**",
533-
"**/vs/workbench/{common,browser,node,electron-browser}/**",
595+
"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
534596
"**/vs/workbench/services/**",
535597
"**/vs/workbench/contrib/**",
536598
"**/vs/workbench/test/**",
@@ -624,17 +686,32 @@
624686
"*" // node modules
625687
]
626688
},
689+
{
690+
"target": "**/vs/workbench/contrib/**/electron-sandbox/**",
691+
"restrictions": [
692+
"vs/nls",
693+
"vs/css!./**/*",
694+
"**/vs/base/**/{common,browser,worker,electron-sandbox}/**",
695+
"**/vs/platform/**/{common,browser,electron-sandbox}/**",
696+
"**/vs/editor/**",
697+
"**/vs/workbench/{common,browser,electron-sandbox}/**",
698+
"**/vs/workbench/api/{common,browser,electron-sandbox}/**",
699+
"**/vs/workbench/services/**/{common,browser,electron-sandbox}/**",
700+
"**/vs/workbench/contrib/**/{common,browser,electron-sandbox}/**"
701+
]
702+
},
627703
{
628704
"target": "**/vs/workbench/contrib/**/electron-browser/**",
629705
"restrictions": [
630706
"vs/nls",
631707
"vs/css!./**/*",
632-
"**/vs/base/**/{common,browser,worker,node,electron-browser}/**",
633-
"**/vs/platform/**/{common,browser,node,electron-browser}/**",
708+
"**/vs/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**",
709+
"**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
634710
"**/vs/editor/**",
635-
"**/vs/workbench/{common,browser,node,electron-browser,api}/**",
636-
"**/vs/workbench/services/**/{common,browser,node,electron-browser}/**",
637-
"**/vs/workbench/contrib/**/{common,browser,node,electron-browser}/**",
711+
"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
712+
"**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
713+
"**/vs/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
714+
"**/vs/workbench/contrib/**/{common,browser,node,electron-sandbox,electron-browser}/**",
638715
"*" // node modules
639716
]
640717
},
@@ -654,10 +731,10 @@
654731
"restrictions": [
655732
"vs/nls",
656733
"vs/css!./**/*",
657-
"**/vs/base/**/{common,browser,node,electron-browser}/**",
658-
"**/vs/base/parts/**/{common,browser,node,electron-browser}/**",
659-
"**/vs/platform/**/{common,browser,node,electron-browser}/**",
660-
"**/vs/code/**/{common,browser,node,electron-browser}/**",
734+
"**/vs/base/**/{common,browser,node,electron-sandbox,electron-browser}/**",
735+
"**/vs/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
736+
"**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
737+
"**/vs/code/**/{common,browser,node,electron-sandbox,electron-browser}/**",
661738
"*" // node modules
662739
]
663740
},
@@ -685,6 +762,54 @@
685762
"*" // node modules
686763
]
687764
},
765+
{
766+
"target": "**/src/vs/workbench/workbench.common.main.ts",
767+
"restrictions": [
768+
"vs/nls",
769+
"**/vs/base/**/{common,browser}/**",
770+
"**/vs/base/parts/**/{common,browser}/**",
771+
"**/vs/platform/**/{common,browser}/**",
772+
"**/vs/editor/**",
773+
"**/vs/workbench/**/{common,browser}/**"
774+
]
775+
},
776+
{
777+
"target": "**/src/vs/workbench/workbench.web.main.ts",
778+
"restrictions": [
779+
"vs/nls",
780+
"**/vs/base/**/{common,browser}/**",
781+
"**/vs/base/parts/**/{common,browser}/**",
782+
"**/vs/platform/**/{common,browser}/**",
783+
"**/vs/editor/**",
784+
"**/vs/workbench/**/{common,browser}/**",
785+
"**/vs/workbench/workbench.common.main"
786+
]
787+
},
788+
{
789+
"target": "**/src/vs/workbench/workbench.sandbox.main.ts",
790+
"restrictions": [
791+
"vs/nls",
792+
"**/vs/base/**/{common,browser,electron-sandbox}/**",
793+
"**/vs/base/parts/**/{common,browser,electron-sandbox}/**",
794+
"**/vs/platform/**/{common,browser,electron-sandbox}/**",
795+
"**/vs/editor/**",
796+
"**/vs/workbench/**/{common,browser,electron-sandbox}/**",
797+
"**/vs/workbench/workbench.common.main"
798+
]
799+
},
800+
{
801+
"target": "**/src/vs/workbench/workbench.desktop.main.ts",
802+
"restrictions": [
803+
"vs/nls",
804+
"**/vs/base/**/{common,browser,node,electron-sandbox,electron-browser}/**",
805+
"**/vs/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
806+
"**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
807+
"**/vs/editor/**",
808+
"**/vs/workbench/**/{common,browser,node,electron-sandbox,electron-browser}/**",
809+
"**/vs/workbench/workbench.common.main",
810+
"**/vs/workbench/workbench.sandbox.main"
811+
]
812+
},
688813
{
689814
"target": "**/extensions/**",
690815
"restrictions": "**/*"

‎.github/workflows/author-verified.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v2
1717
with:
1818
repository: 'microsoft/vscode-github-triage-actions'
19-
ref: v16
19+
ref: v17
2020
path: ./actions
2121
- name: Install Actions
2222
if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'author-verification-requested')

‎.github/workflows/classifier-apply.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/checkout@v2
1212
with:
1313
repository: 'microsoft/vscode-github-triage-actions'
14-
ref: v16
14+
ref: v17
1515
path: ./actions
1616
- name: Install Actions
1717
run: npm install --production --prefix ./actions

‎.github/workflows/commands.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
repository: 'microsoft/vscode-github-triage-actions'
1515
path: ./actions
16-
ref: v16
16+
ref: v17
1717
- name: Install Actions
1818
run: npm install --production --prefix ./actions
1919
- name: Run Commands

‎.github/workflows/english-please.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v2
1414
with:
1515
repository: 'microsoft/vscode-github-triage-actions'
16-
ref: v16
16+
ref: v17
1717
path: ./actions
1818
- name: Install Actions
1919
if: contains(github.event.issue.labels.*.name, '*english-please')

‎.github/workflows/feature-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
repository: 'microsoft/vscode-github-triage-actions'
1919
path: ./actions
20-
ref: v16
20+
ref: v17
2121
- name: Install Actions
2222
if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
2323
run: npm install --production --prefix ./actions

‎.github/workflows/locker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
repository: 'microsoft/vscode-github-triage-actions'
1515
path: ./actions
16-
ref: v16
16+
ref: v17
1717
- name: Install Actions
1818
run: npm install --production --prefix ./actions
1919
- name: Run Locker

‎.github/workflows/needs-more-info-closer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
repository: 'microsoft/vscode-github-triage-actions'
1515
path: ./actions
16-
ref: v16
16+
ref: v17
1717
- name: Install Actions
1818
run: npm install --production --prefix ./actions
1919
- name: Run Needs More Info Closer

‎.github/workflows/on-label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/checkout@v2
1212
with:
1313
repository: 'microsoft/vscode-github-triage-actions'
14-
ref: v16
14+
ref: v17
1515
path: ./actions
1616
- name: Install Actions
1717
run: npm install --production --prefix ./actions

‎.github/workflows/on-open.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/checkout@v2
1212
with:
1313
repository: 'microsoft/vscode-github-triage-actions'
14-
ref: v16
14+
ref: v17
1515
path: ./actions
1616
- name: Install Actions
1717
run: npm install --production --prefix ./actions

0 commit comments

Comments
 (0)