debt - restore old layer name and more TS checks

.eslint-plugin-local/code-import-patterns.ts

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

build/buildfile.js

@@ -18,7 +18,7 @@ exports.workerExtensionHost = createModuleDescription('vs/workbench/api/worker/e
 exports.workerNotebook = createModuleDescription('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain');
 exports.workerLanguageDetection = createModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain');
 exports.workerLocalFileSearch = createModuleDescription('vs/workbench/services/search/worker/localFileSearchMain');
-exports.workerProfileAnalysis = createModuleDescription('vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain');
+exports.workerProfileAnalysis = createModuleDescription('vs/platform/profiling/electron-browser/profileAnalysisWorkerMain');
 exports.workerOutputLinks = createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputerMain');
 exports.workerBackgroundTokenization = createModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain');
 
@@ -43,7 +43,7 @@ exports.code = [
 	// 'vs/code/node/cli' is not included here because it comes in via ./src/cli.js
 	createModuleDescription('vs/code/node/cliProcessMain'),
 	createModuleDescription('vs/code/electron-utility/sharedProcess/sharedProcessMain'),
-	createModuleDescription('vs/code/electron-sandbox/workbench/workbench'),
+	createModuleDescription('vs/code/electron-browser/workbench/workbench'),
 	createModuleDescription('vs/workbench/contrib/webview/browser/pre/service-worker')
 ];
 

build/checker/layersChecker.ts

@@ -55,9 +55,9 @@ const RULES: IRule[] = [
 		disallowedTypes: [/* Ignore native types that are defined from here */],
 	},
 
-	// Common: vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts
+	// Common: vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts
 	{
-		target: '**/vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts',
+		target: '**/vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts',
 		disallowedTypes: NATIVE_TYPES,
 	},
 
@@ -67,6 +67,12 @@ const RULES: IRule[] = [
 		disallowedTypes: NATIVE_TYPES,
 	},
 
+	// Common
+	{
+		target: '**/vs/**/worker/**',
+		disallowedTypes: NATIVE_TYPES,
+	},
+
 	// Browser
 	{
 		target: '**/vs/**/browser/**',

build/checker/tsconfig.browser.json

@@ -11,6 +11,7 @@
 		"skipLibCheck": true
 	},
 	"include": [
+		"../../src/*.ts",
 		"../../src/**/common/**/*.ts",
 		"../../src/**/browser/**/*.ts",
 		"../../src/typings/*.d.ts",

build/checker/tsconfig.electron-sandbox.json → build/checker/tsconfig.electron-browser.json

@@ -3,7 +3,7 @@
 	"include": [
 		"../../src/**/common/**/*.ts",
 		"../../src/**/browser/**/*.ts",
-		"../../src/**/electron-sandbox/**/*.ts",
+		"../../src/**/electron-browser/**/*.ts",
 		"../../src/typings/*.d.ts",
 		"../../src/vs/monaco.d.ts",
 		"../../src/vscode-dts/vscode.proposed.*.d.ts",
@@ -15,7 +15,7 @@
 	"exclude": [
 		"../../src/**/test/**",
 		"../../src/**/fixtures/**",
-		"../../src/vs/base/parts/sandbox/electron-sandbox/preload.ts", 		// Preload scripts for Electron sandbox
-		"../../src/vs/base/parts/sandbox/electron-sandbox/preload-aux.ts"	// have limited access to node.js APIs
+		"../../src/vs/base/parts/sandbox/electron-browser/preload.ts", 		// Preload scripts for Electron sandbox
+		"../../src/vs/base/parts/sandbox/electron-browser/preload-aux.ts"	// have limited access to node.js APIs
 	]
 }

build/checker/tsconfig.electron-main.json

@@ -1,9 +1,13 @@
 {
 	"extends": "./tsconfig.node.json",
 	"include": [
+		"../../src/**/common/**/*.ts",
+		"../../src/**/node/**/*.ts",
 		"../../src/**/electron-main/**/*.ts",
-		"../../src/**/electron-utility/**/*.ts",
 		"../../src/typings/*.d.ts",
+		"../../src/vs/monaco.d.ts",
+		"../../src/vscode-dts/vscode.proposed.*.d.ts",
+		"../../src/vscode-dts/vscode.d.ts",
 		"../../node_modules/@types/trusted-types/index.d.ts",
 	],
 	"exclude": [

build/checker/tsconfig.electron-utility.json

@@ -0,0 +1,17 @@
+{
+	"extends": "./tsconfig.node.json",
+	"include": [
+		"../../src/**/common/**/*.ts",
+		"../../src/**/node/**/*.ts",
+		"../../src/**/electron-utility/**/*.ts",
+		"../../src/typings/*.d.ts",
+		"../../src/vs/monaco.d.ts",
+		"../../src/vscode-dts/vscode.proposed.*.d.ts",
+		"../../src/vscode-dts/vscode.d.ts",
+		"../../node_modules/@types/trusted-types/index.d.ts",
+	],
+	"exclude": [
+		"../../src/**/test/**",
+		"../../src/**/fixtures/**",
+	]
+}

build/checker/tsconfig.node.json

@@ -11,6 +11,7 @@
 		"skipLibCheck": true
 	},
 	"include": [
+		"../../src/*.ts",
 		"../../src/**/common/**/*.ts",
 		"../../src/**/node/**/*.ts",
 		"../../src/typings/*.d.ts",

build/checker/tsconfig.worker.json

@@ -0,0 +1,28 @@
+{
+	"extends": "../../src/tsconfig.base.json",
+	"compilerOptions": {
+		"lib": [
+			"ES2022",
+			"WebWorker",
+			"Webworker.Iterable",
+			"WebWorker.AsyncIterable"
+		],
+		"types": [],
+		"noEmit": true,
+		"skipLibCheck": true
+	},
+	"include": [
+		"../../src/**/common/**/*.ts",
+		"../../src/**/worker/**/*.ts",
+		"../../src/typings/*.d.ts",
+		"../../src/vs/monaco.d.ts",
+		"../../src/vscode-dts/vscode.proposed.*.d.ts",
+		"../../src/vscode-dts/vscode.d.ts",
+		"../../node_modules/@types/trusted-types/index.d.ts",
+		"../../node_modules/@types/wicg-file-system-access/index.d.ts"
+	],
+	"exclude": [
+		"../../src/**/test/**",
+		"../../src/**/fixtures/**"
+	]
+}

build/gulpfile.reh.js

@@ -80,7 +80,7 @@ const serverResourceIncludes = [
 ];
 
 const serverResourceExcludes = [
-	'!out-build/vs/**/{electron-sandbox,electron-main,electron-utility}/**',
+	'!out-build/vs/**/{electron-browser,electron-main,electron-utility}/**',
 	'!out-build/vs/editor/standalone/**',
 	'!out-build/vs/workbench/**/*-tb.png',
 	'!**/test/**'

build/gulpfile.vscode.js

@@ -57,11 +57,11 @@ const vscodeResourceIncludes = [
 	'out-build/nls.keys.json',
 
 	// Workbench
-	'out-build/vs/code/electron-sandbox/workbench/workbench.html',
+	'out-build/vs/code/electron-browser/workbench/workbench.html',
 
 	// Electron Preload
-	'out-build/vs/base/parts/sandbox/electron-sandbox/preload.js',
-	'out-build/vs/base/parts/sandbox/electron-sandbox/preload-aux.js',
+	'out-build/vs/base/parts/sandbox/electron-browser/preload.js',
+	'out-build/vs/base/parts/sandbox/electron-browser/preload-aux.js',
 
 	// Node Scripts
 	'out-build/vs/base/node/{terminateProcess.sh,cpuUsage.sh,ps.sh}',
@@ -138,7 +138,7 @@ const bundleVSCodeTask = task.define('bundle-vscode', task.series(
 					...bootstrapEntryPoints
 				],
 				resources: vscodeResources,
-				skipTSBoilerplateRemoval: entryPoint => entryPoint === 'vs/code/electron-sandbox/workbench/workbench'
+				skipTSBoilerplateRemoval: entryPoint => entryPoint === 'vs/code/electron-browser/workbench/workbench'
 			}
 		}
 	)
@@ -220,12 +220,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const out = sourceFolderName;
 
 		const checksums = computeChecksums(out, [
-			'vs/base/parts/sandbox/electron-sandbox/preload.js',
+			'vs/base/parts/sandbox/electron-browser/preload.js',
 			'vs/workbench/workbench.desktop.main.js',
 			'vs/workbench/workbench.desktop.main.css',
 			'vs/workbench/api/node/extensionHostProcess.js',
-			'vs/code/electron-sandbox/workbench/workbench.html',
-			'vs/code/electron-sandbox/workbench/workbench.js'
+			'vs/code/electron-browser/workbench/workbench.html',
+			'vs/code/electron-browser/workbench/workbench.js'
 		]);
 
 		const src = gulp.src(out + '/**', { base: '.' })

build/gulpfile.vscode.web.js

@@ -66,7 +66,7 @@ const vscodeWebResources = [
 	...vscodeWebResourceIncludes,
 
 	// Excludes
-	'!out-build/vs/**/{node,electron-sandbox,electron-main,electron-utility}/**',
+	'!out-build/vs/**/{node,electron-browser,electron-main,electron-utility}/**',
 	'!out-build/vs/editor/standalone/**',
 	'!out-build/vs/workbench/**/*-tb.png',
 	'!out-build/vs/code/**/*-dev.html',

eslint.config.js

@@ -99,7 +99,7 @@ export default tseslint.config(
 					'browser': [
 						'common'
 					],
-					'electron-sandbox': [
+					'electron-browser': [
 						'common',
 						'browser'
 					],
@@ -406,10 +406,10 @@ export default tseslint.config(
 			]
 		}
 	},
-	// browser/electron-sandbox layer
+	// browser/electron-browser layer
 	{
 		files: [
-			'src/**/{browser,electron-sandbox}/**/*.ts'
+			'src/**/{browser,electron-browser}/**/*.ts'
 		],
 		languageOptions: {
 			parser: tseslint.parser,
@@ -770,7 +770,7 @@ export default tseslint.config(
 				{
 					// imports that are allowed in all files of layers:
 					// - browser
-					// - electron-sandbox
+					// - electron-browser
 					'when': 'hasBrowser',
 					'allow': []
 				},
@@ -866,18 +866,18 @@ export default tseslint.config(
 				//  - src/vs/base/common
 				//  - src/vs/base/worker
 				//  - src/vs/base/browser
-				//  - src/vs/base/electron-sandbox
+				//  - src/vs/base/electron-browser
 				//  - src/vs/base/node
 				//  - 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/electron-browser
 				//  - src/vs/base/test/node
 				//  - src/vs/base/test/electron-main
 				//
 				// When /~ is used in the restrictions, it will be replaced with the correct
-				// layers that can be used e.g. 'src/vs/base/electron-sandbox' will be able
+				// layers that can be used e.g. 'src/vs/base/electron-browser' will be able
 				// to import '{common,browser,electron-sanbox}', etc.
 				//
 				// It is possible to use /~ in the restrictions property even without using it in
@@ -1203,7 +1203,7 @@ export default tseslint.config(
 				},
 				{
 					'target': 'src/vs/workbench/workbench.desktop.main.ts',
-					'layer': 'electron-sandbox',
+					'layer': 'electron-browser',
 					'restrictions': [
 						'vs/base/*/~',
 						'vs/base/parts/*/~',

package.json

@@ -44,7 +44,7 @@
     "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit",
     "tsec-compile-check": "node node_modules/tsec/bin/tsec -p src/tsconfig.tsec.json",
     "vscode-dts-compile-check": "tsc -p src/tsconfig.vscode-dts.json && tsc -p src/tsconfig.vscode-proposed-dts.json",
-    "valid-layers-check": "node build/checker/layersChecker.js && tsc -p build/checker/tsconfig.browser.json && tsc -p build/checker/tsconfig.node.json && tsc -p build/checker/tsconfig.electron-sandbox.json && tsc -p build/checker/tsconfig.electron-main.json",
+    "valid-layers-check": "node build/checker/layersChecker.js && tsc -p build/checker/tsconfig.browser.json && tsc -p build/checker/tsconfig.worker.json && tsc -p build/checker/tsconfig.node.json && tsc -p build/checker/tsconfig.electron-browser.json && tsc -p build/checker/tsconfig.electron-main.json && tsc -p build/checker/tsconfig.electron-utility.json",
     "define-class-fields-check": "node build/lib/propertyInitOrderChecker.js && tsc -p src/tsconfig.defineClassFields.json",
     "update-distro": "node build/npm/update-distro.mjs",
     "web": "echo 'npm run web' is replaced by './scripts/code-server' or './scripts/code-web'",

src/bootstrap-import.ts

@@ -6,7 +6,7 @@
 // *********************************************************************
 // *                                                                   *
 // *  We need this to redirect to node_modules from the remote-folder. *
-// *  This ONLY applies  when running out of source.                   *
+// *  This ONLY applies when running out of source.                   *
 // *                                                                   *
 // *********************************************************************
 

src/tsec.exemptions.json

@@ -1,6 +1,6 @@
 {
 	"ban-document-execcommand": [
-		"vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts",
+		"vs/workbench/contrib/codeEditor/electron-browser/inputClipboardActions.ts",
 		"vs/editor/contrib/clipboard/browser/clipboard.ts"
 	],
 	"ban-eval-calls": [
@@ -12,7 +12,7 @@
 		"vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts"
 	],
 	"ban-trustedtypes-createpolicy": [
-		"vs/code/electron-sandbox/workbench/workbench.ts",
+		"vs/code/electron-browser/workbench/workbench.ts",
 		"vs/amdX.ts",
 		"vs/base/browser/trustedTypes.ts",
 		"vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts"
@@ -37,6 +37,6 @@
 		"**/*.ts"
 	],
 	"ban-script-content-assignments": [
-		"vs/code/electron-sandbox/workbench/workbench.ts"
+		"vs/code/electron-browser/workbench/workbench.ts"
 	]
 }

src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts → src/vs/base/parts/contextmenu/electron-browser/contextmenu.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CONTEXT_MENU_CHANNEL, CONTEXT_MENU_CLOSE_CHANNEL, IContextMenuEvent, IContextMenuItem, IPopupOptions, ISerializableContextMenuItem } from '../common/contextmenu.js';
-import { ipcRenderer } from '../../sandbox/electron-sandbox/globals.js';
+import { ipcRenderer } from '../../sandbox/electron-browser/globals.js';
 
 let contextMenuIdPool = 0;
 

src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts → src/vs/base/parts/ipc/electron-browser/ipc.electron.ts

@@ -8,7 +8,7 @@ import { Event } from '../../../common/event.js';
 import { IDisposable } from '../../../common/lifecycle.js';
 import { IPCClient } from '../common/ipc.js';
 import { Protocol as ElectronProtocol } from '../common/ipc.electron.js';
-import { ipcRenderer } from '../../sandbox/electron-sandbox/globals.js';
+import { ipcRenderer } from '../../sandbox/electron-browser/globals.js';
 
 /**
  * An implementation of `IPCClient` on top of Electron `ipcRenderer` IPC communication

src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts → src/vs/base/parts/ipc/electron-browser/ipc.mp.ts

@@ -6,7 +6,7 @@
 import { mainWindow } from '../../../browser/window.js';
 import { Event } from '../../../common/event.js';
 import { generateUuid } from '../../../common/uuid.js';
-import { ipcMessagePort, ipcRenderer } from '../../sandbox/electron-sandbox/globals.js';
+import { ipcMessagePort, ipcRenderer } from '../../sandbox/electron-browser/globals.js';
 
 interface IMessageChannelResult {
 	nonce: string;

src/vs/base/parts/ipc/electron-main/ipc.mp.ts

@@ -34,7 +34,7 @@ export class Client extends MessagePortClient implements IDisposable {
 /**
  * This method opens a message channel connection
  * in the target window. The target window needs
- * to use the `Server` from `electron-sandbox/ipc.mp`.
+ * to use the `Server` from `electron-browser/ipc.mp`.
  */
 export async function connect(window: BrowserWindow): Promise<MessagePortMain> {
 

src/vs/base/parts/sandbox/electron-sandbox/electronTypes.ts → src/vs/base/parts/sandbox/electron-browser/electronTypes.ts

@@ -6,7 +6,7 @@
 
 // #######################################################################
 // ###                                                                 ###
-// ###      electron.d.ts types we expose from electron-sandbox        ###
+// ###      electron.d.ts types we expose from electron-browser        ###
 // ###                    (copied from Electron 29.x)                  ###
 // ###                                                                 ###
 // #######################################################################