Merge pull request #642 from codestoryai/fetch-upstream-290524

Fetch upstream 290524

.eslintrc.json

@@ -151,21 +151,13 @@
 					{
 						// Files should (only) be removed from the list they adopt the leak detector
 						"exclude": [
-							"src/vs/base/test/browser/browser.test.ts",
-							"src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts",
-							"src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts",
 							"src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts",
-							"src/vs/editor/test/common/services/languageService.test.ts",
-							"src/vs/editor/test/node/classification/typescript.test.ts",
 							"src/vs/platform/configuration/test/common/configuration.test.ts",
-							"src/vs/platform/extensions/test/common/extensionValidator.test.ts",
 							"src/vs/platform/opener/test/common/opener.test.ts",
 							"src/vs/platform/registry/test/common/platform.test.ts",
-							"src/vs/platform/remote/test/common/remoteHosts.test.ts",
 							"src/vs/platform/workspace/test/common/workspace.test.ts",
 							"src/vs/platform/workspaces/test/electron-main/workspaces.test.ts",
 							"src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts",
-							"src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts",
 							"src/vs/workbench/api/test/node/extHostTunnelService.test.ts",
 							"src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts",
 							"src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts",
@@ -176,7 +168,6 @@
 							"src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts",
 							"src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts",
 							"src/vs/workbench/services/commands/test/common/commandService.test.ts",
-							"src/vs/workbench/services/extensions/test/common/extensionDescriptionRegistry.test.ts",
 							"src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts",
 							"src/vs/workbench/test/browser/quickAccess.test.ts"
 						]
@@ -317,6 +308,10 @@
 						"selector": "BinaryExpression[operator='instanceof'][right.name='MouseEvent']",
 						"message": "Use DOM.isMouseEvent() to support multi-window scenarios."
 					},
+					{
+						"selector": "BinaryExpression[operator='instanceof'][right.name=/^HTML\\w+/]",
+						"message": "Use DOM.isHTMLElement() and related methods to support multi-window scenarios."
+					},
 					{
 						"selector": "BinaryExpression[operator='instanceof'][right.name='KeyboardEvent']",
 						"message": "Use DOM.isKeyboardEvent() to support multi-window scenarios."

.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts

@@ -24,7 +24,7 @@ const ATTACH_CONFIG_NAME = 'Attach to VS Code';
 const DEBUG_TYPE = 'pwa-chrome';
 
 export abstract class VSCodeTestRunner {
-	constructor(protected readonly repoLocation: vscode.WorkspaceFolder) {}
+	constructor(protected readonly repoLocation: vscode.WorkspaceFolder) { }
 
 	public async run(baseArgs: ReadonlyArray<string>, filter?: ReadonlyArray<vscode.TestItem>) {
 		const args = this.prepareArguments(baseArgs, filter);
@@ -163,18 +163,40 @@ export abstract class VSCodeTestRunner {
 				path.relative(data.workspaceFolder.uri.fsPath, data.uri.fsPath).replace(/\\/g, '/')
 			);
 
+		const itemDatas = filter.map(f => itemData.get(f));
+		/** If true, we have to be careful with greps, as a grep for one test file affects the run of the other test file. */
+		const hasBothTestCaseOrTestSuiteAndTestFileFilters =
+			itemDatas.some(d => (d instanceof TestCase) || (d instanceof TestSuite)) &&
+			itemDatas.some(d => d instanceof TestFile);
+
+		function addTestCaseOrSuite(data: TestCase | TestSuite, test: vscode.TestItem): void {
+			grepRe.push(escapeRe(data.fullName) + (data instanceof TestCase ? '$' : ' '));
+			for (let p = test.parent; p; p = p.parent) {
+				const parentData = itemData.get(p);
+				if (parentData instanceof TestFile) {
+					addTestFileRunPath(parentData);
+				}
+			}
+		}
+
 		for (const test of filter) {
 			const data = itemData.get(test);
 			if (data instanceof TestCase || data instanceof TestSuite) {
-				grepRe.push(escapeRe(data.fullName) + (data instanceof TestCase ? '$' : ' '));
-				for (let p = test.parent; p; p = p.parent) {
-					const parentData = itemData.get(p);
-					if (parentData instanceof TestFile) {
-						addTestFileRunPath(parentData);
+				addTestCaseOrSuite(data, test);
+			} else if (data instanceof TestFile) {
+				if (!hasBothTestCaseOrTestSuiteAndTestFileFilters) {
+					addTestFileRunPath(data);
+				} else {
+					// We add all the items individually so they get their own grep expressions.
+					for (const [_id, nestedTest] of test.children) {
+						const childData = itemData.get(nestedTest);
+						if (childData instanceof TestCase || childData instanceof TestSuite) {
+							addTestCaseOrSuite(childData, nestedTest);
+						} else {
+							console.error('Unexpected test item in test file', nestedTest.id, nestedTest.label);
+						}
 					}
 				}
-			} else if (data instanceof TestFile) {
-				addTestFileRunPath(data);
 			}
 		}
 
@@ -303,5 +325,5 @@ export const PlatformTestRunner =
 	process.platform === 'win32'
 		? WindowsTestRunner
 		: process.platform === 'darwin'
-		? DarwinTestRunner
-		: PosixTestRunner;
+			? DarwinTestRunner
+			: PosixTestRunner;

ThirdPartyNotices.txt

@@ -517,7 +517,7 @@ to the base-name name of the original file, and an extension of txt, html, or si
 
 ---------------------------------------------------------
 
-go-syntax 0.6.5 - MIT
+go-syntax 0.6.6 - MIT
 https://github.com/worlpaker/go-syntax
 
 MIT License
@@ -777,7 +777,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-jeff-hykin/better-shell-syntax 1.8.3 - MIT
+jeff-hykin/better-shell-syntax 1.8.7 - MIT
 https://github.com/jeff-hykin/better-shell-syntax
 
 MIT License

build/azure-pipelines/product-build.yml

@@ -164,7 +164,7 @@ resources:
     - repository: 1ESPipelines
       type: git
       name: 1ESPipelineTemplates/1ESPipelineTemplates
-      ref: refs/heads/joao/disable-tsa-linux-arm64
+      ref: refs/tags/release
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines

build/lib/stylelint/vscode-known-variables.json

@@ -128,8 +128,10 @@
 		"--vscode-dropdown-listBackground",
 		"--vscode-editor-background",
 		"--vscode-editor-findMatchBackground",
+		"--vscode-editor-findMatchForeground",
 		"--vscode-editor-findMatchBorder",
 		"--vscode-editor-findMatchHighlightBackground",
+		"--vscode-editor-findMatchHighlightForeground",
 		"--vscode-editor-findMatchHighlightBorder",
 		"--vscode-editor-findRangeHighlightBackground",
 		"--vscode-editor-findRangeHighlightBorder",

cglicenses.json

@@ -130,6 +130,21 @@
 			"SOFTWARE"
 		]
 	},
+	{
+		// Reason: NPM package does not include repository URL https://github.com/microsoft/vscode-deviceid/issues/12
+		"name": "@vscode/deviceid",
+		"fullLicenseText": [
+			"Copyright (c) Microsoft Corporation.",
+			"",
+			"MIT License",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
 	{
 		// Reason: Missing license file
 		"name": "@tokenizer/token",
@@ -317,13 +332,21 @@
 		"fullLicenseTextUri": "https://raw.githubusercontent.com/rodrimati1992/const_format_crates/b2207af46bfbd9f1a6bd12dbffd10feeea3d9fd7/LICENSE-ZLIB.md"
 	},
 	{ // License is MIT/Apache and tool doesn't look in subfolders
-		"name": "toml",
-		"fullLicenseTextUri": "https://raw.githubusercontent.com/toml-rs/toml/main/crates/toml/LICENSE-MIT"
+		"name": "toml_edit",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/toml-rs/toml/main/crates/toml_edit/LICENSE-MIT"
+	},
+	{ // License is MIT/Apache and tool doesn't look in subfolders
+		"name": "toml_datetime",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/toml-rs/toml/main/crates/toml_datetime/LICENSE-MIT"
 	},
 	{ // License is MIT/Apache and tool doesn't look in subfolders
 		"name": "dirs-sys-next",
 		"fullLicenseTextUri": "https://raw.githubusercontent.com/xdg-rs/dirs/master/dirs-sys/LICENSE-MIT"
 	},
+	{ // License is MIT/Apache and gitlab API doesn't find the project
+		"name": "libredox",
+		"fullLicenseTextUri": "https://gitlab.redox-os.org/redox-os/libredox/-/raw/master/LICENSE"
+	},
 	{
 		"name": "https-proxy-agent",
 		"fullLicenseText": [