Merge remote-tracking branch 'origin/main' into tyriar/utility_ptyhost

Author: Tyriar

.eslintplugin/code-import-patterns.ts

@@ -18,7 +18,7 @@ interface ConditionalPattern {
 
 interface RawImportPatternsConfig {
 	target: string;
-	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-browser' | 'electron-main';
+	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-main';
 	test?: boolean;
 	restrictions: string | (string | ConditionalPattern)[];
 }
@@ -77,7 +77,7 @@ export = new class implements eslint.Rule.RuleModule {
 			return this._optionsCache.get(options)!;
 		}
 
-		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-browser' | 'electron-main';
+		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-main';
 
 		interface ILayerRule {
 			layer: Layer;
@@ -96,7 +96,6 @@ export = new class implements eslint.Rule.RuleModule {
 			{ layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true },
 			{ layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true },
 			{ layer: 'node', deps: orSegment(['common', 'node']), isNode: true },
-			{ layer: 'electron-browser', deps: orSegment(['common', 'browser', 'node', 'electron-sandbox', 'electron-browser']), isBrowser: true, isNode: true },
 			{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-main']), isNode: true },
 		];
 

.eslintplugin/vscode-dts-string-type-literals.ts

@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiTypeDiscrimination implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines' },
+		messages: {
+			noTypeDiscrimination: 'Do not use type descrimination properties'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		return {
+			['TSPropertySignature[optional=undefined] TSTypeAnnotation TSLiteralType Literal']: (node: any) => {
+
+				const raw = String((<TSESTree.Literal>node).raw)
+
+				if (/^('|").*\1$/.test(raw)) {
+
+					context.report({
+						node: node,
+						messageId: 'noTypeDiscrimination'
+					});
+				}
+			}
+		}
+	}
+};

.eslintrc.json

@@ -87,12 +87,6 @@
 					"common",
 					"browser"
 				],
-				"electron-browser": [
-					"common",
-					"browser",
-					"node",
-					"electron-sandbox"
-				],
 				"electron-main": [
 					"common",
 					"node"
@@ -136,6 +130,7 @@
 			"rules": {
 				"local/vscode-dts-create-func": "warn",
 				"local/vscode-dts-literal-or-types": "warn",
+				"local/vscode-dts-string-type-literals": "warn",
 				"local/vscode-dts-interface-naming": "warn",
 				"local/vscode-dts-cancellation": "warn",
 				"local/vscode-dts-use-thenable": "warn",
@@ -210,7 +205,6 @@
 						// imports that are allowed in all files of layers:
 						// - browser
 						// - electron-sandbox
-						// - electron-browser
 						"when": "hasBrowser",
 						"allow": [
 							"vs/css!./**/*"
@@ -219,7 +213,6 @@
 					{
 						// imports that are allowed in all files of layers:
 						// - node
-						// - electron-browser
 						// - electron-main
 						"when": "hasNode",
 						"allow": [
@@ -229,6 +222,9 @@
 							"@vscode/ripgrep",
 							"@vscode/iconv-lite-umd",
 							"@vscode/policy-watcher",
+							"@vscode/proxy-agent",
+							"@vscode/spdlog",
+							"@vscode/windows-process-tree",
 							"assert",
 							"child_process",
 							"console",
@@ -248,18 +244,15 @@
 							"os",
 							"path",
 							"perf_hooks",
-							"spdlog",
 							"stream",
 							"string_decoder",
 							"tas-client-umd",
 							"tls",
 							"url",
 							"util",
 							"v8-inspect-profiler",
-							"vscode-proxy-agent",
 							"vscode-regexpp",
 							"vscode-textmate",
-							"windows-process-tree",
 							"worker_threads",
 							"xterm",
 							"xterm-addon-canvas",
@@ -297,14 +290,12 @@
 					//  - src/vs/base/browser
 					//  - src/vs/base/electron-sandbox
 					//  - src/vs/base/node
-					//  - src/vs/base/electron-browser
 					//  - src/vs/base/electron-main
 					//  - src/vs/base/test/common
 					//  - src/vs/base/test/worker
 					//  - src/vs/base/test/browser
 					//  - src/vs/base/test/electron-sandbox
 					//  - src/vs/base/test/node
-					//  - src/vs/base/test/electron-browser
 					//  - src/vs/base/test/electron-main
 					//
 					// When /~ is used in the restrictions, it will be replaced with the correct

.github/classifier.json

@@ -199,9 +199,9 @@
 		"sash-widget": {"assign": ["joaomoreno"]},
 		"scm": {"assign": ["lszomoru"]},
 		"screencast-mode": {"assign": ["joaomoreno"]},
-		"search": {"assign": ["andreamah"]},
-		"search-api": {"assign": ["andreamah"]},
-		"search-editor": {"assign": ["andreamah"]},
+		"search": {"assign": ["andreamah", "roblourens"]},
+		"search-api": {"assign": ["andreamah", "roblourens"]},
+		"search-editor": {"assign": ["andreamah", "roblourens"]},
 		"search-replace": {"assign": ["sandy081"]},
 		"semantic-tokens": {"assign": ["alexdima", "aeschli"]},
 		"server": {"assign": ["alexdima"]},

.github/workflows/rich-navigation.yml

@@ -1,7 +1,6 @@
 name: "Rich Navigation Indexing"
 on:
   workflow_dispatch:
-  pull_request:
   push:
     branches:
       - main

.gitignore

@@ -16,3 +16,4 @@ vscode.lsif
 vscode.db
 /.profile-oss
 /cli/target
+product.overrides.json

.nvmrc

@@ -1 +1 @@
-16.14
+16.17

.vscode/extensions.json

@@ -4,6 +4,8 @@
 	"recommendations": [
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
+		"GitHub.vscode-pull-request-github",
+		"ms-vscode.vscode-github-issue-notebooks",
 		"ms-vscode.vscode-selfhost-test-provider"
 	]
 }

.vscode/launch.json

@@ -24,15 +24,15 @@
 			]
 		},
 		{
-			"type": "chrome",
+			"type": "node",
 			"request": "attach",
+			"restart": true,
 			"name": "Attach to Shared Process",
-			"timeout": 30000,
-			"port": 9222,
-			"urlFilter": "*sharedProcess*.html*",
-			"presentation": {
-				"hidden": true
-			}
+			"timeout": 0,
+			"port": 5879,
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			]
 		},
 		{
 			"type": "node",
@@ -236,7 +236,6 @@
 				"VSCODE_SKIP_PRELAUNCH": "1"
 			},
 			"cleanUp": "wholeBrowser",
-			"urlFilter": "*workbench*.html*",
 			"runtimeArgs": [
 				"--inspect-brk=5875",
 				"--no-cached-data",
@@ -526,7 +525,7 @@
 			"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",
+			"url": "http://localhost:5001",
 			"preLaunchTask": "Launch Http Server",
 			"presentation": {
 				"group": "monaco",

.vscode/notebooks/api.github-issues

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