Merge branch 'main' into patch-1

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"name": "VS Code",
+	"name": "Code - OSS with X11/Wayland",
 	"build": {
 		"dockerfile": "Dockerfile"
 	},

.devcontainer/prebuilt/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"name": "Code - OSS",
+	"name": "Code - OSS with VNC",
 
 	// Image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
 	"image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-main",

.eslintplugin/vscode-dts-interface-naming.ts

@@ -8,7 +8,7 @@ import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 export = new class ApiInterfaceNaming implements eslint.Rule.RuleModule {
 
-	private static _nameRegExp = /I[A-Z]/;
+	private static _nameRegExp = /^I[A-Z]/;
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {

.eslintrc.json

@@ -181,6 +181,7 @@
 							"invalidate",
 							"open",
 							"override",
+							"perform",
 							"receive",
 							"register",
 							"remove",
@@ -227,6 +228,7 @@
 							"@vscode/vscode-languagedetection",
 							"@vscode/ripgrep",
 							"@vscode/iconv-lite-umd",
+							"@vscode/policy-watcher",
 							"assert",
 							"child_process",
 							"console",
@@ -254,7 +256,6 @@
 							"url",
 							"util",
 							"v8-inspect-profiler",
-							"vscode-policy-watcher",
 							"vscode-proxy-agent",
 							"vscode-regexpp",
 							"vscode-textmate",
@@ -428,7 +429,8 @@
 							"vs/workbench/api/~",
 							"vs/workbench/~",
 							"vs/workbench/services/*/~",
-							"vs/workbench/contrib/*/~"
+							"vs/workbench/contrib/*/~",
+							"vs/workbench/contrib/terminalContrib/*/~"
 						]
 					},
 					{
@@ -476,6 +478,35 @@
 							} // node module allowed even in /browser/
 						]
 					},
+					{
+						"target": "src/vs/workbench/contrib/terminalContrib/*/~",
+						"restrictions": [
+							"vs/base/~",
+							"vs/base/parts/*/~",
+							"vs/platform/*/~",
+							"vs/editor/~",
+							"vs/editor/contrib/*/~",
+							"vs/workbench/~",
+							"vs/workbench/services/*/~",
+							"vs/workbench/contrib/*/~",
+							// Only allow terminalContrib to import from itself, this works because
+							// terminalContrib is one extra folder deep
+							"vs/workbench/contrib/terminalContrib/*/~",
+							"vscode-notebook-renderer", // Type only import
+							{
+								"when": "hasBrowser",
+								"pattern": "xterm"
+							}, // node module allowed even in /browser/
+							{
+								"when": "hasBrowser",
+								"pattern": "xterm-addon-*"
+							}, // node module allowed even in /browser/
+							{
+								"when": "hasBrowser",
+								"pattern": "vscode-textmate"
+							} // node module allowed even in /browser/
+						]
+					},
 					{
 						"target": "src/vs/code/~",
 						"restrictions": [
@@ -512,6 +543,13 @@
 							"vs/server/~"
 						]
 					},
+					{
+						"target": "src/vs/workbench/contrib/terminal/terminal.all.ts",
+						"layer": "browser",
+						"restrictions": [
+							"vs/workbench/contrib/**"
+						]
+					},
 					{
 						"target": "src/vs/workbench/workbench.common.main.ts",
 						"layer": "browser",
@@ -525,7 +563,8 @@
 							"vs/workbench/~",
 							"vs/workbench/api/~",
 							"vs/workbench/services/*/~",
-							"vs/workbench/contrib/*/~"
+							"vs/workbench/contrib/*/~",
+							"vs/workbench/contrib/terminal/terminal.all"
 						]
 					},
 					{

.github/classifier.json

@@ -25,7 +25,7 @@
 		"comments": {"assign": ["alexr00"]},
 		"config": {"assign": ["sandy081"]},
 		"containers": {"assign": ["chrmarti"]},
-		"context-keys": {"assign": ["alexdima"]},
+		"context-keys": {"assign": ["ulugbekna"]},
 		"continue-working-on": {"assign": ["joyceerhl"]},
 		"css-less-scss": {"assign": ["aeschli"]},
 		"custom-editors": {"assign": ["mjbvz"]},
@@ -40,7 +40,7 @@
 		"editor-bracket-matching": {"assign": ["hediet"]},
 		"editor-clipboard": {"assign": ["alexdima", "rebornix"]},
 		"editor-code-actions": {"assign": ["mjbvz"]},
-		"editor-color-picker": {"assign": ["rebornix"]},
+		"editor-color-picker": {"assign": ["aiday-mar"]},
 		"editor-columnselect": {"assign": ["alexdima"]},
 		"editor-commands": {"assign": ["alexdima"]},
 		"editor-comments": {"assign": ["alexdima"]},
@@ -51,7 +51,7 @@
 		"editor-find": {"assign": ["rebornix"]},
 		"editor-folding": {"assign": ["aeschli"]},
 		"editor-highlight": {"assign": ["alexdima"]},
-		"editor-hover": {"assign": ["alexdima"]},
+		"editor-hover": {"assign": ["aiday-mar"]},
 		"editor-indent-detection": {"assign": ["alexdima"]},
 		"editor-indent-guides": {"assign": ["hediet"]},
 		"editor-input": {"assign": ["alexdima"]},
@@ -65,7 +65,7 @@
 		"editor-RTL": {"assign": ["alexdima"]},
 		"editor-scrollbar": {"assign": ["alexdima"]},
 		"editor-sorting": {"assign": ["alexdima"]},
-		"editor-sticky-scroll": {"assign": ["jrieken"]},
+		"editor-sticky-scroll": {"assign": ["aiday-mar"]},
 		"editor-symbols": {"assign": ["jrieken"]},
 		"editor-synced-region": {"assign": ["aeschli"]},
 		"editor-textbuffer": {"assign": ["alexdima", "rebornix"]},
@@ -105,7 +105,7 @@
 		"image-preview": {"assign": ["mjbvz"]},
 		"inlay-hints": {"assign": ["jrieken", "hediet"]},
 		"inline-completions": {"assign": ["hediet"]},
-		"install-update": {"assign": ["joaomoreno"]},
+		"install-update": {"assign": ["joaomoreno"], "accuracy": 0.85},
 		"intellisense-config": {"assign": ["rzhao271"]},
 		"interactive-playground": {"assign": ["chrmarti"]},
 		"interactive-window": {"assign": ["amunger", "rebornix"]},
@@ -114,9 +114,10 @@
 		"issue-reporter": {"assign": ["TylerLeonhardt"]},
 		"javascript": {"assign": ["mjbvz"]},
 		"json": {"assign": ["aeschli"]},
-		"keybindings": {"assign": ["alexdima"]},
+		"json-sorting": {"assign": ["aiday-mar"]},
+		"keybindings": {"assign": ["ulugbekna"]},
 		"keybindings-editor": {"assign": ["sandy081"]},
-		"keyboard-layout": {"assign": ["alexdima"]},
+		"keyboard-layout": {"assign": ["ulugbekna"]},
 		"L10N": {"assign": ["TylerLeonhardt", "csigs"]},
 		"l10n-platform": {"assign": ["TylerLeonhardt"]},
 		"label-provider": {"assign": ["lramos15"]},
@@ -193,6 +194,7 @@
 		"remote-explorer": {"assign": ["alexr00"]},
 		"remote-tunnel": {"assign": ["aeschli", "connor4312"]},
 		"rename": {"assign": ["jrieken"]},
+		"runCommands": {"assign": ["ulugbekna"]},
 		"sandbox": {"assign": ["deepak1556"]},
 		"sash-widget": {"assign": ["joaomoreno"]},
 		"scm": {"assign": ["lszomoru"]},
@@ -210,7 +212,7 @@
 		"shared-process": {"assign": []},
 		"simple-file-dialog": {"assign": ["alexr00"]},
 		"smart-select": {"assign": ["jrieken"]},
-		"snap": {"assign": ["joaomoreno"]},
+		"snap": {"assign": ["deepak1556"]},
 		"snippets": {"assign": ["jrieken"]},
 		"splitview-widget": {"assign": ["joaomoreno"]},
 		"ssh": {"assign": ["eleanorjboyd"]},

.github/commands.json

@@ -440,6 +440,20 @@
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the Codespaces extension. Please file the issue in the [Codespaces Discussion Forum](http://aka.ms/ghcs-feedback). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
+	{
+		"type": "comment",
+		"name": "extCopilot",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "close",
+		"reason": "not_planned",
+		"addLabel": "*caused-by-extension",
+		"comment": "It looks like this is caused by the Copilot extension. Please file the issue in the [Copilot Discussion Forum](https://github.com/community/community/discussions/categories/copilot). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
+	},
 	{
 		"type": "comment",
 		"name": "gifPlease",

.github/workflows/locker.yml

@@ -23,6 +23,6 @@ jobs:
           daysSinceClose: 45
           appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
           daysSinceUpdate: 3
-          ignoredLabel: "*out-of-scope"
+          ignoredLabel: "*out-of-scope,accessibility"
           ignoreLabelUntil: "author-verification-requested"
           labelUntil: "verified"

.vscode/launch.json

@@ -521,6 +521,17 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceRoot}/extensions/debug-auto-launch"
 			]
+		},
+		{
+			"name": "Monaco Editor Playground",
+			"type": "chrome",
+			"request": "launch",
+			"url": "https://microsoft.github.io/monaco-editor/playground.html?source=http%3A%2F%2Flocalhost%3A5001%2Fout%2Fvs",
+			"preLaunchTask": "Launch Http Server",
+			"presentation": {
+				"group": "monaco",
+				"order": 4
+			}
 		}
 	],
 	"compounds": [

.vscode/notebooks/api.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"February 2023\""
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"April 2023\""
   },
   {
     "kind": 1,

.vscode/notebooks/endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$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 repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"January 2023\""
+    "value": "$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 repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"April 2023\""
   },
   {
     "kind": 1,

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

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$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 repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"January 2023\"\n\n$MINE=assignee:@me"
+    "value": "$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 repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"April 2023\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 1,

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

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "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 repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-markdown-languageservice\n\n// current milestone name\n$milestone=milestone:\"January 2023\""
+    "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 repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-markdown-languageservice\n\n// current milestone name\n$milestone=milestone:\"April 2023\""
   },
   {
     "kind": 1,

.vscode/notebooks/verification.github-issues

@@ -12,7 +12,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$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 repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n$milestone=milestone:\"November 2022\""
+    "value": "$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 repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n$milestone=milestone:\"February 2023\""
   },
   {
     "kind": 1,

.vscode/settings.json

@@ -24,10 +24,12 @@
 		"out-build/**": true,
 		"out-vscode/**": true,
 		"i18n/**": true,
+		"extensions/**/dist/**": true,
 		"extensions/**/out/**": true,
 		"test/smoke/out/**": true,
 		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true,
+		"src/vs/base/test/common/filters.perf.data.js": true,
 		"src/vs/base/test/node/uri.test.data.txt": true,
 		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true,
 		"src/vs/editor/test/node/diffing/fixtures/**": true,
@@ -118,5 +120,9 @@
 	},
 	"githubPullRequests.assignCreated": "${user}",
 	"githubPullRequests.defaultMergeMethod": "squash",
-	"application.experimental.rendererProfiling": true
+	"githubPullRequests.ignoredPullRequestBranches": [
+		"main"
+	],
+	"application.experimental.rendererProfiling": true,
+	"editor.experimental.asyncTokenization": true
 }

.vscode/tasks.json

@@ -255,6 +255,26 @@
 			"group": "build",
 			"label": "npm: tsec-compile-check",
 			"detail": "node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit"
+		},
+		{
+			// Used for monaco editor playground launch config
+			"label": "Launch Http Server",
+			"type": "shell",
+			"command": "node_modules/.bin/http-server --cors --port 5001 -a 127.0.0.1 -c-1 -s",
+			"isBackground": true,
+			"problemMatcher": {
+				"pattern": {
+					"regexp": ""
+				},
+				"background": {
+					"activeOnStart": true,
+					"beginsPattern": "never match",
+					"endsPattern": ".*"
+				}
+			},
+			"dependsOn": [
+				"Core - Build"
+			]
 		}
 	]
 }