Skip to content

Commit 65a6230

Browse files
committed
Merge remote-tracking branch 'origin/main' into pr/thebinarysearchtree/135197
2 parents e19b983 + a993ada commit 65a6230

File tree

798 files changed

+19621
-8901
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

+19621
-8901
lines changed

.eslintrc.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,17 +1071,6 @@
10711071
}
10721072
]
10731073
}
1074-
},
1075-
{
1076-
"files": [
1077-
"src/vs/server/*"
1078-
],
1079-
"rules": {
1080-
"header/header": [
1081-
// hygiene.js still checks that all files (even those in this directory) are MIT licensed.
1082-
"off"
1083-
]
1084-
}
10851074
}
10861075
]
10871076
}

.github/commands.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"name": "notebook-triage",
7979
"regex": "notebook.*",
8080
"action": "updateLabels",
81-
"addLabel": "needs-notebook-triage"
81+
"addLabel": "notebook-triage"
8282
},
8383
{
8484
"type": "label",

.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/notebooks/endgame.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": "$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 repo:microsoft/vscode-unpkg\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,

.vscode/notebooks/grooming-delta.github-issues

Lines changed: 70 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -159,21 +159,6 @@
159159
"language": "github-issues",
160160
"value": "repo:microsoft/vscode-test is:issue created:>$since"
161161
},
162-
{
163-
"kind": 1,
164-
"language": "markdown",
165-
"value": "# vscode-chrome-debug (deprecated)"
166-
},
167-
{
168-
"kind": 2,
169-
"language": "github-issues",
170-
"value": "repo:microsoft/vscode-chrome-debug is:issue closed:>$since"
171-
},
172-
{
173-
"kind": 2,
174-
"language": "github-issues",
175-
"value": "repo:microsoft/vscode-chrome-debug is:issue created:>$since"
176-
},
177162
{
178163
"kind": 1,
179164
"language": "markdown",
@@ -294,21 +279,6 @@
294279
"language": "github-issues",
295280
"value": "repo:microsoft/vscode-html-languageservice is:issue created:>$since"
296281
},
297-
{
298-
"kind": 1,
299-
"language": "markdown",
300-
"value": "# vscode-jshint"
301-
},
302-
{
303-
"kind": 2,
304-
"language": "github-issues",
305-
"value": "repo:microsoft/vscode-jshint is:issue closed:>$since"
306-
},
307-
{
308-
"kind": 2,
309-
"language": "github-issues",
310-
"value": "repo:microsoft/vscode-jshint is:issue created:>$since"
311-
},
312282
{
313283
"kind": 1,
314284
"language": "markdown",
@@ -334,6 +304,11 @@
334304
"language": "github-issues",
335305
"value": "repo:microsoft/vscode-languageserver-node is:issue closed:>$since"
336306
},
307+
{
308+
"kind": 1,
309+
"language": "markdown",
310+
"value": ""
311+
},
337312
{
338313
"kind": 2,
339314
"language": "github-issues",
@@ -519,21 +494,6 @@
519494
"language": "github-issues",
520495
"value": "repo:microsoft/inno-updater is:issue created:>$since"
521496
},
522-
{
523-
"kind": 1,
524-
"language": "markdown",
525-
"value": "# language-server-protocol-inspector"
526-
},
527-
{
528-
"kind": 2,
529-
"language": "github-issues",
530-
"value": "repo:microsoft/language-server-protocol-inspector is:issue closed:>$since"
531-
},
532-
{
533-
"kind": 2,
534-
"language": "github-issues",
535-
"value": "repo:microsoft/language-server-protocol-inspector is:issue created:>$since"
536-
},
537497
{
538498
"kind": 1,
539499
"language": "markdown",
@@ -638,5 +598,70 @@
638598
"kind": 2,
639599
"language": "github-issues",
640600
"value": "repo:microsoft/node-jsonc-parser is:issue created:>$since"
601+
},
602+
{
603+
"kind": 1,
604+
"language": "markdown",
605+
"value": "# vscode-jupyter"
606+
},
607+
{
608+
"kind": 2,
609+
"language": "github-issues",
610+
"value": "repo:microsoft/vscode-jupyter is:issue closed:>$since"
611+
},
612+
{
613+
"kind": 2,
614+
"language": "github-issues",
615+
"value": "repo:microsoft/vscode-jupyter is:issue created:>$since"
616+
},
617+
{
618+
"kind": 1,
619+
"language": "markdown",
620+
"value": "# vscode-python"
621+
},
622+
{
623+
"kind": 2,
624+
"language": "github-issues",
625+
"value": "repo:microsoft/vscode-python is:issue closed:>$since"
626+
},
627+
{
628+
"kind": 2,
629+
"language": "github-issues",
630+
"value": "repo:microsoft/vscode-python is:issue created:>$since"
631+
},
632+
{
633+
"kind": 1,
634+
"language": "markdown",
635+
"value": "# vscode-livepreview"
636+
},
637+
{
638+
"kind": 2,
639+
"language": "github-issues",
640+
"value": "repo:microsoft/vscode-livepreview is:issue closed:>$since"
641+
},
642+
{
643+
"kind": 2,
644+
"language": "github-issues",
645+
"value": "repo:microsoft/vscode-livepreview is:issue created:>$since"
646+
},
647+
{
648+
"kind": 1,
649+
"language": "markdown",
650+
"value": ""
651+
},
652+
{
653+
"kind": 1,
654+
"language": "markdown",
655+
"value": "# vscode-test"
656+
},
657+
{
658+
"kind": 2,
659+
"language": "github-issues",
660+
"value": "repo:microsoft/vscode-test is:issue closed:>$since"
661+
},
662+
{
663+
"kind": 2,
664+
"language": "github-issues",
665+
"value": "repo:microsoft/vscode-test is:issue created:>$since"
641666
}
642667
]

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

Lines changed: 2 additions & 2 deletions
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-remotehub repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"September 2021\"\n\n$MINE=assignee:@me"
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-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"October 2021\"\n\n$MINE=assignee:@me"
1111
},
1212
{
1313
"kind": 1,
@@ -147,7 +147,7 @@
147147
{
148148
"kind": 2,
149149
"language": "github-issues",
150-
"value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found"
150+
"value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:needs-triage -label:verification-found"
151151
},
152152
{
153153
"kind": 1,

.vscode/notebooks/my-work.github-issues

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry\n\n// current milestone name\n$milestone=milestone:\"October 2021\""
10+
"value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github\n\n// current milestone name\n$milestone=milestone:\"October 2021\""
1111
},
1212
{
1313
"kind": 1,
@@ -82,7 +82,7 @@
8282
{
8383
"kind": 2,
8484
"language": "github-issues",
85-
"value": "$repos assignee:@me is:open type:issue -label:bug -label:\"needs more info\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish"
85+
"value": "$repos assignee:@me is:open type:issue -label:bug -label:\"needs more info\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item"
8686
},
8787
{
8888
"kind": 1,

.vscode/settings.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
"**/.DS_Store": true,
99
"build/**/*.js": {
1010
"when": "$(basename).ts"
11-
},
12-
"src/vs/server": false
11+
}
1312
},
1413
"files.associations": {
1514
"cglicenses.json": "jsonc"
@@ -27,8 +26,7 @@
2726
"test/automation/out/**": true,
2827
"test/integration/browser/out/**": true,
2928
"src/vs/base/test/node/uri.test.data.txt": true,
30-
"src/vs/workbench/test/browser/api/extHostDocumentData.test.perf-data.ts": true,
31-
"src/vs/server": false
29+
"src/vs/workbench/test/browser/api/extHostDocumentData.test.perf-data.ts": true
3230
},
3331
"lcov.path": [
3432
"./.build/coverage/lcov.info",

0 commit comments

Comments
 (0)