Skip to content

Commit 6dafb79

Browse files
jmcpherspositron-bot[bot]
jmcphers
and
positron-bot[bot]
committed
Merge remote-tracking branch 'upstream/main'
Lead-authored-by: Jonathan McPherson <[email protected]> Co-authored-by: positron-bot[bot] <173392469+positron-bot[bot]@users.noreply.github.com>
1 parent 7d79515 commit 6dafb79

File tree

956 files changed

+18140
-13726
lines changed

Some content is hidden

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

956 files changed

+18140
-13726
lines changed

Diff for: ‎build/lib/eslint/code-import-patterns.ts renamed to ‎.eslintplugin/code-import-patterns.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import * as eslint from 'eslint';
77
import { TSESTree } from '@typescript-eslint/experimental-utils';
88
import * as path from 'path';
9-
import * as minimatch from 'minimatch';
9+
import minimatch from 'minimatch';
1010
import { createImportRuleListener } from './utils';
1111

12-
const REPO_ROOT = path.normalize(path.join(__dirname, '../../../'));
12+
const REPO_ROOT = path.normalize(path.join(__dirname, '../'));
1313

1414
interface ConditionalPattern {
1515
when?: 'hasBrowser' | 'hasNode' | 'test';

Diff for: ‎build/lib/eslint/code-layering.ts renamed to ‎.eslintplugin/code-layering.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/code-no-look-behind-regex.ts renamed to ‎.eslintplugin/code-no-look-behind-regex.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/code-no-nls-in-standalone-editor.ts renamed to ‎.eslintplugin/code-no-nls-in-standalone-editor.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/code-no-standalone-editor.ts renamed to ‎.eslintplugin/code-no-standalone-editor.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/code-no-test-only.ts renamed to ‎.eslintplugin/code-no-test-only.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/code-no-unexternalized-strings.ts renamed to ‎.eslintplugin/code-no-unexternalized-strings.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/code-no-unused-expressions.ts renamed to ‎.eslintplugin/code-no-unused-expressions.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/code-translation-remind.ts renamed to ‎.eslintplugin/code-translation-remind.ts

File renamed without changes.

Diff for: ‎.eslintplugin/index.js

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
const glob = require('glob');
2+
const path = require('path');
3+
4+
require('ts-node').register({ experimentalResolver: true, transpileOnly: true });
5+
6+
// Re-export all .ts files as rules
7+
const rules = {};
8+
glob.sync(`${__dirname}/*.ts`).forEach((file) => {
9+
rules[path.basename(file, '.ts')] = require(file);
10+
});
11+
12+
exports.rules = rules;

Diff for: ‎.eslintplugin/tsconfig.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"compilerOptions": {
3+
"target": "es2020",
4+
"lib": [
5+
"ES2020"
6+
],
7+
"module": "commonjs",
8+
"esModuleInterop": true,
9+
"alwaysStrict": true,
10+
"allowJs": true,
11+
"strict": true,
12+
"exactOptionalPropertyTypes": false,
13+
"useUnknownInCatchVariables": false,
14+
"noUnusedLocals": true,
15+
"noUnusedParameters": true,
16+
"newLine": "lf",
17+
"noEmit": true
18+
},
19+
"include": [
20+
"**/*.ts",
21+
"**/*.js"
22+
],
23+
"exclude": [
24+
"node_modules/**"
25+
]
26+
}

Diff for: ‎build/lib/eslint/utils.ts renamed to ‎.eslintplugin/utils.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/vscode-dts-cancellation.ts renamed to ‎.eslintplugin/vscode-dts-cancellation.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/vscode-dts-create-func.ts renamed to ‎.eslintplugin/vscode-dts-create-func.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/vscode-dts-event-naming.ts renamed to ‎.eslintplugin/vscode-dts-event-naming.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/vscode-dts-interface-naming.ts renamed to ‎.eslintplugin/vscode-dts-interface-naming.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/vscode-dts-literal-or-types.ts renamed to ‎.eslintplugin/vscode-dts-literal-or-types.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/vscode-dts-provider-naming.ts renamed to ‎.eslintplugin/vscode-dts-provider-naming.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/vscode-dts-region-comments.ts renamed to ‎.eslintplugin/vscode-dts-region-comments.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/vscode-dts-use-thenable.ts renamed to ‎.eslintplugin/vscode-dts-use-thenable.ts

File renamed without changes.

Diff for: ‎build/lib/eslint/vscode-dts-vscode-in-comments.ts renamed to ‎.eslintplugin/vscode-dts-vscode-in-comments.ts

File renamed without changes.

Diff for: ‎.eslintrc.json

+22-21
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"plugins": [
99
"@typescript-eslint",
1010
"jsdoc",
11-
"header"
11+
"header",
12+
"local"
1213
],
1314
"rules": {
1415
"constructor-super": "warn",
@@ -61,17 +62,17 @@
6162
]
6263
}
6364
],
64-
"code-no-unused-expressions": [
65+
"local/code-no-unused-expressions": [
6566
"warn",
6667
{
6768
"allowTernary": true
6869
}
6970
],
70-
"code-translation-remind": "warn",
71-
"code-no-nls-in-standalone-editor": "warn",
72-
"code-no-standalone-editor": "warn",
73-
"code-no-unexternalized-strings": "warn",
74-
"code-layering": [
71+
"local/code-translation-remind": "warn",
72+
"local/code-no-nls-in-standalone-editor": "warn",
73+
"local/code-no-standalone-editor": "warn",
74+
"local/code-no-unexternalized-strings": "warn",
75+
"local/code-layering": [
7576
"warn",
7677
{
7778
"common": [],
@@ -122,8 +123,8 @@
122123
"**/*.test.ts"
123124
],
124125
"rules": {
125-
"code-no-test-only": "error",
126-
"code-no-unexternalized-strings": "off"
126+
"local/code-no-test-only": "error",
127+
"local/code-no-unexternalized-strings": "off"
127128
}
128129
},
129130
{
@@ -132,14 +133,14 @@
132133
"**/vscode.proposed.*.d.ts"
133134
],
134135
"rules": {
135-
"vscode-dts-create-func": "warn",
136-
"vscode-dts-literal-or-types": "warn",
137-
"vscode-dts-interface-naming": "warn",
138-
"vscode-dts-cancellation": "warn",
139-
"vscode-dts-use-thenable": "warn",
140-
"vscode-dts-region-comments": "warn",
141-
"vscode-dts-vscode-in-comments": "warn",
142-
"vscode-dts-provider-naming": [
136+
"local/vscode-dts-create-func": "warn",
137+
"local/vscode-dts-literal-or-types": "warn",
138+
"local/vscode-dts-interface-naming": "warn",
139+
"local/vscode-dts-cancellation": "warn",
140+
"local/vscode-dts-use-thenable": "warn",
141+
"local/vscode-dts-region-comments": "warn",
142+
"local/vscode-dts-vscode-in-comments": "warn",
143+
"local/vscode-dts-provider-naming": [
143144
"warn",
144145
{
145146
"allowed": [
@@ -154,7 +155,7 @@
154155
]
155156
}
156157
],
157-
"vscode-dts-event-naming": [
158+
"local/vscode-dts-event-naming": [
158159
"warn",
159160
{
160161
"allowed": [
@@ -200,8 +201,8 @@
200201
"src/**/*.ts"
201202
],
202203
"rules": {
203-
"code-no-look-behind-regex": "warn",
204-
"code-import-patterns": [
204+
"local/code-no-look-behind-regex": "warn",
205+
"local/code-import-patterns": [
205206
"warn",
206207
{
207208
// imports that are allowed in all files of layers:
@@ -576,7 +577,7 @@
576577
"test/**/*.ts"
577578
],
578579
"rules": {
579-
"code-import-patterns": [
580+
"local/code-import-patterns": [
580581
"warn",
581582
{
582583
"target": "test/smoke/**",

Diff for: ‎.github/classifier.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/master/classifier-deep/apply/apply-labels/deep-classifier-config.schema.json",
3-
"vacation": ["RMacfarlane", "eamodio"],
2+
"$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/stable/classifier-deep/apply/apply-labels/deep-classifier-config.schema.json",
3+
"vacation": [],
44
"assignees": {
55
"nameToOverrideAccuracyOf": {"accuracy": 0.8}
66
},
@@ -85,7 +85,7 @@
8585
"html": {"assign": ["aeschli"]},
8686
"i18n": {"assign": []},
8787
"icon-brand": {"assign": []},
88-
"icons-product": {"assign": ["misolori"]},
88+
"icons-product": {"assign": ["daviddossett"]},
8989
"inlay-hints": {"assign": ["jrieken", "hediet"]},
9090
"inline-completions": {"assign": ["hediet"]},
9191
"install-update": {"assign": []},
@@ -132,7 +132,7 @@
132132
"rename": {"assign": ["jrieken"]},
133133
"scm": {"assign": ["lszomoru"]},
134134
"screencast-mode": {"assign": ["lszomoru"]},
135-
"search": {"assign": ["roblourens"]},
135+
"search": {"assign": ["roblourens", "andreamah"]},
136136
"search-editor": {"assign": ["roblourens"]},
137137
"search-replace": {"assign": ["sandy081"]},
138138
"semantic-tokens": {"assign": ["alexdima", "aeschli"]},
@@ -158,7 +158,7 @@
158158
"undo-redo": {"assign": ["alexdima"]},
159159
"unit-test": {"assign": []},
160160
"uri": {"assign": ["jrieken"]},
161-
"ux": {"assign": ["misolori"]},
161+
"ux": {"assign": ["daviddossett"]},
162162
"variable-resolving": {"assign": []},
163163
"vscode-build": {"assign": []},
164164
"web": {"assign": []},

Diff for: ‎.github/commands.json

+14-17
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@
1111
"action": "updateLabels",
1212
"addLabel": "*question"
1313
},
14+
{
15+
"type": "comment",
16+
"name": "dev-question",
17+
"allowUsers": [
18+
"cleidigh",
19+
"usernamehw",
20+
"gjsjohnmurray",
21+
"IllusionMH"
22+
],
23+
"action": "updateLabels",
24+
"addLabel": "*dev-question"
25+
},
1426
{
1527
"type": "label",
1628
"name": "*question",
@@ -23,7 +35,7 @@
2335
"name": "*dev-question",
2436
"action": "close",
2537
"reason": "not_planned",
26-
"comment": "We have a great developer community [over on slack](https://aka.ms/vscode-dev-community) where extension authors help each other. This is a great place for you to ask questions and find support.\n\nHappy Coding!"
38+
"comment": "We have a great extension developer community over on [GitHub discussions](https://github.com/microsoft/vscode-discussions/discussions) and [Slack](https://aka.ms/vscode-dev-community) where extension authors help each other. This is a great place for you to ask questions and find support.\n\nHappy Coding!"
2739
},
2840
{
2941
"type": "label",
@@ -63,7 +75,7 @@
6375
"name": "*caused-by-extension",
6476
"action": "close",
6577
"reason": "not_planned",
66-
"comment": "This issue is caused by an extension, please file it with the repository (or contact) the extension has linked in its overview in VS Code or the [marketplace](https://aka.ms/vscodemarketplace) for VS Code. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
78+
"comment": "This issue is caused by an extension, please file it with the repository (or contact) the extension has linked in its overview in VS Code or the [marketplace](https://aka.ms/vscodemarketplace) for VS Code. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). If you don't know which extension is causing the problem, you can run `Help: Start extension bisect` from the command palette (F1) to help identify the problem extension.\n\nHappy Coding!"
6779
},
6880
{
6981
"type": "label",
@@ -72,21 +84,6 @@
7284
"reason": "not_planned",
7385
"comment": "The described behavior is how it is expected to work. If you disagree, please explain what is expected and what is not in more detail. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
7486
},
75-
{
76-
"type": "label",
77-
"name": "notebook",
78-
"regex": "notebook.*",
79-
"assign": [
80-
"rebornix"
81-
]
82-
},
83-
{
84-
"type": "label",
85-
"name": "notebook-triage",
86-
"regex": "notebook.*",
87-
"action": "updateLabels",
88-
"addLabel": "notebook-triage"
89-
},
9087
{
9188
"type": "label",
9289
"name": "L10N",

Diff for: ‎.mailmap

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
Eric Amodio <[email protected]> Eric Amodio <[email protected]>
2-
Eric Amodio <[email protected]> Eric Amodio <[email protected]>
31
Daniel Imms <[email protected]> Daniel Imms <[email protected]>
4-
Tanha Kabir <[email protected]> Tanha Kabir <[email protected]>
52
Raymond Zhao <[email protected]>
63
Tyler Leonhardt <[email protected]> Tyler Leonhardt <[email protected]>
4+
João Moreno <[email protected]> João Moreno <[email protected]>

Diff for: ‎.vscode/launch.json

+9-6
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
"name": "Attach to Main Process",
6868
"timeout": 30000,
6969
"port": 5875,
70+
"continueOnAttach": true,
7071
"outFiles": [
7172
"${workspaceFolder}/out/**/*.js"
7273
],
@@ -237,7 +238,7 @@
237238
"cleanUp": "wholeBrowser",
238239
"urlFilter": "*workbench.html*",
239240
"runtimeArgs": [
240-
"--inspect=5875",
241+
"--inspect-brk=5875",
241242
"--no-cached-data",
242243
"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
243244
// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
@@ -468,10 +469,9 @@
468469
"type": "node",
469470
"request": "launch",
470471
"name": "Launch Smoke Test",
471-
"program": "${workspaceFolder}/test/smoke/out/main.js",
472+
"program": "${workspaceFolder}/test/smoke/test/index.js",
472473
"cwd": "${workspaceFolder}/test/smoke",
473474
"timeout": 240000,
474-
"port": 9999,
475475
"args": [
476476
"-l",
477477
"${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron"
@@ -512,9 +512,10 @@
512512
}
513513
},
514514
{
515-
"name": "Search and Renderer processes",
515+
"name": "Search, Renderer, and Main processes",
516516
"configurations": [
517517
"Launch VS Code Internal",
518+
"Attach to Main Process",
518519
"Attach to Search Process"
519520
],
520521
"presentation": {
@@ -523,9 +524,10 @@
523524
}
524525
},
525526
{
526-
"name": "Renderer and Extension Host processes",
527+
"name": "Renderer, Extension Host, and Main processes",
527528
"configurations": [
528529
"Launch VS Code Internal",
530+
"Attach to Main Process",
529531
"Attach to Extension Host"
530532
],
531533
"presentation": {
@@ -556,10 +558,11 @@
556558
}
557559
},
558560
{
559-
"name": "Launch VS Code",
561+
"name": "Renderer and Main processes",
560562
"stopAll": true,
561563
"configurations": [
562564
"Launch VS Code Internal",
565+
"Attach to Main Process"
563566
],
564567
"preLaunchTask": "Ensure Prelaunch Dependencies"
565568
},

Diff for: ‎.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:\"August 2022\""
10+
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"September 2022\""
1111
},
1212
{
1313
"kind": 1,

Diff for: ‎.vscode/notebooks/my-endgame.github-issues

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
{
158158
"kind": 2,
159159
"language": "github-issues",
160-
"value": "$REPOS $MILESTONE -$MINE is:issue is:closed sort:updated-asc label:bug -label:unreleased -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 -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:dynamicwebpaige -author:eamodio -author:egamma -author:fiveisprime -author:greazer -author:gregvanl -author:hediet -author:IanMatthewHuff -author:isidorn -author:ItalyPaleAle -author:JacksonKearl -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr-author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:ornellaalt -author:orta -author:rchiodo -author:rebornix -author:roblourens -author:rzhao271 -author:sana-ajani -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:kimadeline -author:amunger"
160+
"value": "$REPOS $MILESTONE -$MINE is:issue is:closed sort:updated-asc label:bug -label:unreleased -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 -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:gregvanl -author:hediet -author:IanMatthewHuff -author:isidorn -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger"
161161
},
162162
{
163163
"kind": 1,

Diff for: ‎.vscode/notebooks/my-work.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": "// 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-unpkg 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 repo:microsoft/monaco-editor repo:microsoft/vscode-vsce\n\n// current milestone name\n$milestone=milestone:\"August 2022\""
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-unpkg 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 repo:microsoft/monaco-editor repo:microsoft/vscode-vsce\n\n// current milestone name\n$milestone=milestone:\"September 2022\""
1111
},
1212
{
1313
"kind": 1,

Diff for: ‎.vscode/settings.json

-5
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@
4141
}
4242
}
4343
],
44-
"eslint.options": {
45-
"rulePaths": [
46-
"./build/lib/eslint"
47-
]
48-
},
4944
"typescript.tsdk": "node_modules/typescript/lib",
5045
"npm.exclude": "**/extensions/**",
5146
"npm.packageManager": "yarn",

Diff for: ‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ please see the document [How to Contribute](https://github.com/microsoft/vscode/
4343
* [Request a new feature](CONTRIBUTING.md)
4444
* Upvote [popular feature requests](https://github.com/microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc)
4545
* [File an issue](https://github.com/microsoft/vscode/issues)
46+
* Connect with the extension author community on [GitHub Discussions](https://github.com/microsoft/vscode-discussions/discussions) or [Slack](https://aka.ms/vscode-dev-community)
4647
* Follow [@code](https://twitter.com/code) and let us know what you think!
4748

4849
See our [wiki](https://github.com/microsoft/vscode/wiki/Feedback-Channels) for a description of each of these channels and information on some other available community-driven channels.

0 commit comments

Comments
 (0)