Joramtech · pull · May 15, 2025 · May 15, 2025 · May 15, 2025 · May 15, 2025
diff --git a/.configurations/configuration.dsc.yaml → .config/configuration.winget b/.configurations/configuration.dsc.yaml → .config/configuration.winget
@@ -5,31 +5,33 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       directives:
         description: Install Git
-        allowPrerelease: true
+        # Requires elevation for the set operation (i.e., for installing the package)
+        securityContext: elevated
       settings:
         id: Git.Git
         source: winget
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: npm
       directives:
         description: Install NodeJS version 20
-        allowPrerelease: true
+        # Requires elevation for the set operation (i.e., for installing the package)
+        securityContext: elevated
       settings:
         id: OpenJS.NodeJS.LTS
         version: "20.14.0"
         source: winget
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       directives:
         description: Install Python 3.10
-        allowPrerelease: true
       settings:
         id: Python.Python.3.10
         source: winget
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 (any edition is OK)
-        allowPrerelease: true
+        # Requires elevation for the set operation (i.e., for installing the package)
+        securityContext: elevated
       settings:
         id: Microsoft.VisualStudio.2022.BuildTools
         source: winget
@@ -38,6 +40,8 @@ properties:
         - vsPackage
       directives:
         description: Install required VS workloads
+        # Requires elevation for the get and set operations
+        securityContext: elevated
         allowPrerelease: true
       settings:
         productId: Microsoft.VisualStudio.Product.BuildTools

diff --git a/.config/guardian/.gdnsuppress b/.config/guardian/.gdnsuppress
@@ -0,0 +1,46 @@
+{
+  "hydrated": false,
+  "properties": {
+    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions"
+  },
+  "version": "1.0.0",
+  "suppressionSets": {
+    "default": {
+      "name": "default",
+      "createdDate": "2025-03-17 11:52:32Z",
+      "lastUpdatedDate": "2025-03-17 11:52:32Z"
+    }
+  },
+  "results": {
+    "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8": {
+      "signature": "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8",
+      "alternativeSignatures": [
+        "07746898f43afab7cc50931b33154c2d9e1a35f82a649dbe8aecf785b3d5a813"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2025-03-17 11:52:32Z"
+    },
+    "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624": {
+      "signature": "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624",
+      "alternativeSignatures": [
+        "4a6cb67bd4b401e9669c13a2162660aaefc0a94a4122e5b50c198414db545672"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2025-03-17 11:52:32Z"
+    },
+    "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad": {
+      "signature": "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad",
+      "alternativeSignatures": [
+        "b7b9eb974d7d3a4ae14df8695ca5a62592c8c9d20b7eda70a6535d50cbda3e7f"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2025-03-17 11:52:32Z"
+    }
+  }
+}
diff --git a/.eslint-ignore b/.eslint-ignore
@@ -37,4 +37,5 @@
 **/test/unit/assert.js
 **/test/automation/out/**
 **/typings/**
+**/.build/**
 !.vscode
diff --git a/.eslint-plugin-local/code-amd-node-module.ts b/.eslint-plugin-local/code-amd-node-module.ts
@@ -51,7 +51,7 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 				node,
 				messageId: 'amdX'
 			});
-		}
+		};
 
 		return {
 			['ImportExpression Literal']: checkImport,

diff --git a/.eslint-plugin-local/code-declare-service-brand.ts b/.eslint-plugin-local/code-declare-service-brand.ts
@@ -19,7 +19,7 @@ export = new class DeclareServiceBrand implements eslint.Rule.RuleModule {
 					node,
 					message: `The '_serviceBrand'-property should not have a value`,
 					fix: (fixer) => {
-						return fixer.replaceText(node, 'declare _serviceBrand: undefined;')
+						return fixer.replaceText(node, 'declare _serviceBrand: undefined;');
 					}
 				});
 			}

diff --git a/.eslint-plugin-local/code-ensure-no-disposables-leak-in-test.ts b/.eslint-plugin-local/code-ensure-no-disposables-leak-in-test.ts
@@ -27,7 +27,7 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 
 		return {
 			[`Program > ExpressionStatement > CallExpression[callee.name='suite']`]: (node: Node) => {
-				const src = context.getSourceCode().getText(node)
+				const src = context.getSourceCode().getText(node);
 				if (!src.includes('ensureNoDisposablesAreLeakedInTestSuite(')) {
 					context.report({
 						node,

diff --git a/.eslint-plugin-local/code-import-patterns.ts b/.eslint-plugin-local/code-import-patterns.ts
@@ -44,7 +44,7 @@ export = new class implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			badImport: 'Imports violates \'{{restrictions}}\' restrictions. See https://github.com/microsoft/vscode/wiki/Source-Code-Organization',
-			badFilename: 'Missing definition in `code-import-patterns` for this file. Define rules at https://github.com/microsoft/vscode/blob/main/.eslintrc.json',
+			badFilename: 'Missing definition in `code-import-patterns` for this file. Define rules at https://github.com/microsoft/vscode/blob/main/eslint.config.js',
 			badAbsolute: 'Imports have to be relative to support ESM',
 			badExtension: 'Imports have to end with `.js` or `.css` to support ESM',
 		},

diff --git a/.eslint-plugin-local/code-limited-top-functions.ts b/.eslint-plugin-local/code-limited-top-functions.ts
@@ -14,13 +14,13 @@ export = new class implements eslint.Rule.RuleModule {
    			layerbreaker: 'You are only allowed to define limited top level functions.'
 		},
 		schema: {
-			type: "array",
+			type: 'array',
 			items: {
-				type: "object",
+				type: 'object',
 				additionalProperties: {
-					type: "array",
+					type: 'array',
 					items: {
-						type: "string"
+						type: 'string'
 					}
 				}
 			}
@@ -65,6 +65,6 @@ export = new class implements eslint.Rule.RuleModule {
 					}
 				}
 			}
-		}
+		};
 	}
 };
diff --git a/.eslint-plugin-local/code-must-use-result.ts b/.eslint-plugin-local/code-must-use-result.ts
@@ -14,22 +14,22 @@ const VALID_USES = new Set<TSESTree.AST_NODE_TYPES | undefined>([
 export = new class MustUseResults implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		schema: false
-	}
+	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
-		const config = <{ message: string, functions: string[] }[]>context.options[0];
+		const config = <{ message: string; functions: string[] }[]>context.options[0];
 		const listener: eslint.Rule.RuleListener = {};
 
 		for (const { message, functions } of config) {
 			for (const fn of functions) {
-				const query = `CallExpression[callee.property.name='${fn}'], CallExpression[callee.name='${fn}']`
+				const query = `CallExpression[callee.property.name='${fn}'], CallExpression[callee.name='${fn}']`;
 				listener[query] = (node: any) => {
 					const cast: TSESTree.CallExpression = node;
 					if (!VALID_USES.has(cast.parent?.type)) {
 						context.report({ node, message });
 					}
-				}
+				};
 			}
 		}
 

diff --git a/.eslint-plugin-local/code-must-use-super-dispose.ts b/.eslint-plugin-local/code-must-use-super-dispose.ts
@@ -14,7 +14,7 @@ export = new class NoAsyncSuite implements eslint.Rule.RuleModule {
 				return;
 			}
 
-			const body = context.getSourceCode().getText(node)
+			const body = context.getSourceCode().getText(node);
 
 			if (body.includes('super.dispose')) {
 				return;

diff --git a/.eslint-plugin-local/code-no-dangerous-type-assertions.ts b/.eslint-plugin-local/code-no-dangerous-type-assertions.ts
@@ -32,7 +32,7 @@ export = new class NoDangerousTypeAssertions implements eslint.Rule.RuleModule {
 
 				context.report({
 					node,
-					message: "Don't use type assertions for creating objects as this can hide type errors."
+					message: `Don't use type assertions for creating objects as this can hide type errors.`
 				});
 			},
 		};

diff --git a/.eslint-plugin-local/code-no-deep-import-of-internal.ts b/.eslint-plugin-local/code-no-deep-import-of-internal.ts
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { join, dirname } from 'path';
+import { createImportRuleListener } from './utils';
+
+export = new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noDeepImportOfInternal: 'No deep import of internal modules allowed! Use a re-export from a non-internal module instead. Internal modules can only be imported by direct parents (any module in {{parentDir}}).'
+		},
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+		},
+		schema: [
+			{
+				type: 'object',
+				additionalProperties: {
+					type: 'boolean'
+				}
+			}
+		]
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		const patterns = context.options[0] as Record<string, boolean>;
+		const internalModulePattern = Object.entries(patterns).map(([key, v]) => v ? key : undefined).filter(v => !!v);
+		const allowedPatterns = Object.entries(patterns).map(([key, v]) => !v ? key : undefined).filter(v => !!v);
+
+		return createImportRuleListener((node, path) => {
+			const importerModuleDir = dirname(context.filename);
+			if (path[0] === '.') {
+				path = join(importerModuleDir, path);
+			}
+			const importedModulePath = path;
+
+			const importerDirParts = splitParts(importerModuleDir);
+			const importedModuleParts = splitParts(importedModulePath);
+
+			for (let i = 0; i < importedModuleParts.length; i++) {
+				if (internalModulePattern.some(p => importedModuleParts[i].match(p)) && allowedPatterns.every(p => !importedModuleParts[i].match(p))) {
+					const importerDirJoined = importerDirParts.join('/');
+					const expectedParentDir = importedModuleParts.slice(0, i).join('/');
+					if (!importerDirJoined.startsWith(expectedParentDir)) {
+						context.report({
+							node,
+							messageId: 'noDeepImportOfInternal',
+							data: {
+								parentDir: expectedParentDir
+							}
+						});
+						return;
+					}
+				}
+			}
+		});
+	}
+};
+
+function splitParts(path: string): string[] {
+	return path.split(/\\|\//);
+}
diff --git a/.eslint-plugin-local/code-no-global-document-listener.ts b/.eslint-plugin-local/code-no-global-document-listener.ts
@@ -25,6 +25,6 @@ export = new class NoGlobalDocumentListener implements eslint.Rule.RuleModule {
 					});
 				}
 			},
-		}
+		};
 	}
 };
diff --git a/.eslint-plugin-local/code-no-nls-in-standalone-editor.ts b/.eslint-plugin-local/code-no-nls-in-standalone-editor.ts
@@ -24,7 +24,7 @@ export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule
 			|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(fileName)
 			|| /vs(\/|\\)editor(\/|\\)editor.api/.test(fileName)
 			|| /vs(\/|\\)editor(\/|\\)editor.main/.test(fileName)
-			|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(fileName)
+			|| /vs(\/|\\)editor(\/|\\)editor.worker.start/.test(fileName)
 		) {
 			return createImportRuleListener((node, path) => {
 				// resolve relative paths

diff --git a/.eslint-plugin-local/code-no-runtime-import.ts b/.eslint-plugin-local/code-no-runtime-import.ts
@@ -16,13 +16,13 @@ export = new class implements eslint.Rule.RuleModule {
 			layerbreaker: 'You are only allowed to import {{import}} from here using `import type ...`.'
 		},
 		schema: {
-			type: "array",
+			type: 'array',
 			items: {
-				type: "object",
+				type: 'object',
 				additionalProperties: {
-					type: "array",
+					type: 'array',
 					items: {
-						type: "string"
+						type: 'string'
 					}
 				}
 			}

diff --git a/.eslint-plugin-local/code-no-standalone-editor.ts b/.eslint-plugin-local/code-no-standalone-editor.ts
@@ -38,7 +38,7 @@ export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule
 				|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path)
 				|| /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
 				|| /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
-				|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)
+				|| /vs(\/|\\)editor(\/|\\)editor.worker.start/.test(path)
 			) {
 				context.report({
 					loc: node.loc,

diff --git a/.eslint-plugin-local/code-no-static-self-ref.ts b/.eslint-plugin-local/code-no-static-self-ref.ts
@@ -26,19 +26,19 @@ export = new class implements eslint.Rule.RuleModule {
 				return;
 			}
 
-			const classCtor = classDeclaration.body.body.find(node => node.type === 'MethodDefinition' && node.kind === 'constructor')
+			const classCtor = classDeclaration.body.body.find(node => node.type === 'MethodDefinition' && node.kind === 'constructor');
 
 			if (!classCtor) {
 				return;
 			}
 
 			const name = classDeclaration.id.name;
-			const valueText = context.sourceCode.getText(<any>propertyDefinition.value)
+			const valueText = context.sourceCode.getText(<any>propertyDefinition.value);
 
 			if (valueText.includes(name + '.')) {
 
 				if (classCtor.value?.type === 'FunctionExpression' && !classCtor.value.params.find((param: any) => param.type === 'TSParameterProperty' && param.decorators?.length > 0)) {
-					return
+					return;
 				}
 
 				context.report({

diff --git a/.eslint-plugin-local/code-no-unused-expressions.ts b/.eslint-plugin-local/code-no-unused-expressions.ts
@@ -58,7 +58,7 @@ module.exports = {
 			allowTernary = config.allowTernary || false,
 			allowTaggedTemplates = config.allowTaggedTemplates || false;
 
-		// eslint-disable-next-line jsdoc/require-description
+		 
 		/**
 		 * @param node any node
 		 * @returns whether the given node structurally represents a directive
@@ -68,7 +68,7 @@ module.exports = {
 				node.expression.type === 'Literal' && typeof node.expression.value === 'string';
 		}
 
-		// eslint-disable-next-line jsdoc/require-description
+		 
 		/**
 		 * @param predicate ([a] -> Boolean) the function used to make the determination
 		 * @param list the input list
@@ -83,7 +83,7 @@ module.exports = {
 			return list.slice();
 		}
 
-		// eslint-disable-next-line jsdoc/require-description
+		 
 		/**
 		 * @param node a Program or BlockStatement node
 		 * @returns the leading sequence of directive nodes in the given node's body
@@ -92,7 +92,7 @@ module.exports = {
 			return takeWhile(looksLikeDirective, node.body);
 		}
 
-		// eslint-disable-next-line jsdoc/require-description
+		 
 		/**
 		 * @param node any node
 		 * @param ancestors the given node's ancestors

diff --git a/.eslint-plugin-local/index.js b/.eslint-plugin-local/index.js
@@ -1,3 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 const glob = require('glob');
 const path = require('path');
-Original file line number
+Diff line change
@@ Expand Up @@
     				node,
     				messageId: 'amdX'
     			});
-    		}
+    		};
     		return {
     			['ImportExpression Literal']: checkImport,
@@ Expand Down @@