[pull] main from microsoft:main

.npmrc

@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
 target="39.2.7"
-ms_build_id="12953945"
+ms_build_id="13098910"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"

build/.moduleignore

@@ -75,10 +75,10 @@ native-is-elevated/src/**
 native-is-elevated/deps/**
 !native-is-elevated/build/Release/*.node
 
-native-watchdog/binding.gyp
-native-watchdog/build/**
-native-watchdog/src/**
-!native-watchdog/build/Release/*.node
+@vscode/native-watchdog/binding.gyp
+@vscode/native-watchdog/build/**
+@vscode/native-watchdog/src/**
+!@vscode/native-watchdog/build/Release/*.node
 
 @vscode/vsce-sign/**
 !@vscode/vsce-sign/src/main.d.ts

build/linux/debian/dep-lists.ts

@@ -33,6 +33,7 @@ export const referenceGeneratedDepsByArch = {
 		'libc6 (>= 2.2.5)',
 		'libc6 (>= 2.25)',
 		'libc6 (>= 2.28)',
+		'libc6 (>= 2.4)',
 		'libcairo2 (>= 1.6.0)',
 		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
 		'libdbus-1-3 (>= 1.9.14)',

eslint.config.js

@@ -1445,6 +1445,7 @@ export default tseslint.config(
 						'@vscode/vscode-languagedetection',
 						'@vscode/ripgrep',
 						'@vscode/iconv-lite-umd',
+						'@vscode/native-watchdog',
 						'@vscode/policy-watcher',
 						'@vscode/proxy-agent',
 						'@vscode/spdlog',
@@ -1463,7 +1464,6 @@ export default tseslint.config(
 						'minimist',
 						'node:module',
 						'native-keymap',
-						'native-watchdog',
 						'net',
 						'node-pty',
 						'os',

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.109.0",
-  "distro": "b570759d1928b4b2f34a86c40da42b1a2b6d3796",
+  "distro": "f44449f84806363760ce8bb8dbe85cd8207498ff",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -79,6 +79,7 @@
     "@types/semver": "^7.5.8",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
+    "@vscode/native-watchdog": "^1.4.6",
     "@vscode/policy-watcher": "^1.3.2",
     "@vscode/proxy-agent": "^0.36.0",
     "@vscode/ripgrep": "^1.15.13",
@@ -108,11 +109,10 @@
     "minimist": "^1.2.8",
     "native-is-elevated": "0.8.0",
     "native-keymap": "^3.3.5",
-    "native-watchdog": "^1.4.1",
     "node-pty": "^1.2.0-beta.6",
     "open": "^10.1.2",
     "tas-client": "0.3.1",
-    "undici": "^7.9.0",
+    "undici": "^7.18.2",
     "v8-inspect-profiler": "^0.1.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
@@ -240,4 +240,4 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.5.0"
   }
-}
+}

remote/package.json

@@ -8,6 +8,7 @@
     "@parcel/watcher": "^2.5.4",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
+    "@vscode/native-watchdog": "^1.4.6",
     "@vscode/proxy-agent": "^0.36.0",
     "@vscode/ripgrep": "^1.15.13",
     "@vscode/spdlog": "^0.15.2",
@@ -32,7 +33,6 @@
     "katex": "^0.16.22",
     "kerberos": "2.1.1",
     "minimist": "^1.2.8",
-    "native-watchdog": "^1.4.1",
     "node-pty": "^1.2.0-beta.6",
     "tas-client": "0.3.1",
     "vscode-oniguruma": "1.7.0",

src/main.ts

@@ -227,7 +227,10 @@ function configureCommandlineSwitchesSync(cliArgs: NativeParsedArgs) {
 		// bypass any specified proxy for the given semi-colon-separated list of hosts
 		'proxy-bypass-list',
 
-		'remote-debugging-port'
+		'remote-debugging-port',
+
+		// Enable recovery from invalid Graphite recordings
+		'enable-graphite-invalid-recording-recovery'
 	];
 
 	if (process.platform === 'linux') {
@@ -374,6 +377,7 @@ interface IArgvConfig {
 	readonly 'use-inmemory-secretstorage'?: boolean;
 	readonly 'enable-rdp-display-tracking'?: boolean;
 	readonly 'remote-debugging-port'?: string;
+	readonly 'enable-graphite-invalid-recording-recovery'?: boolean;
 }
 
 function readArgvConfigSync(): IArgvConfig {

src/vs/editor/browser/viewParts/rulers/rulers.css

@@ -7,4 +7,5 @@
 	position: absolute;
 	top: 0;
 	box-shadow: 1px 0 0 0 var(--vscode-editorRuler-foreground) inset;
+	pointer-events: none;
 }

src/vs/editor/browser/viewParts/rulers/rulers.ts

@@ -70,7 +70,7 @@ export class Rulers extends ViewPart {
 			while (addCount > 0) {
 				const node = createFastDomNode(document.createElement('div'));
 				node.setClassName('view-ruler');
-				node.setWidth('1px');
+				node.setWidth('1ch');
 				this.domNode.appendChild(node);
 				this._renderedRulers.push(node);
 				addCount--;

src/vs/platform/diagnostics/common/diagnostics.ts

@@ -142,11 +142,17 @@ export interface IProcessDiagnostics {
 	readonly name: string;
 }
 
+export interface IGPULogMessage {
+	readonly header: string;
+	readonly message: string;
+}
+
 export interface IMainProcessDiagnostics {
 	readonly mainPID: number;
 	readonly mainArguments: string[]; // All arguments after argv[0], the exec path
 	readonly windows: IWindowDiagnostics[];
 	readonly pidToNames: IProcessDiagnostics[];
 	readonly screenReader: boolean;
 	readonly gpuFeatureStatus: any;
+	readonly gpuLogMessages: IGPULogMessage[];
 }

src/vs/platform/diagnostics/electron-main/diagnosticsMainService.ts

@@ -7,7 +7,7 @@ import { app, BrowserWindow, Event as IpcEvent } from 'electron';
 import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { URI } from '../../../base/common/uri.js';
-import { IDiagnosticInfo, IDiagnosticInfoOptions, IMainProcessDiagnostics, IProcessDiagnostics, IRemoteDiagnosticError, IRemoteDiagnosticInfo, IWindowDiagnostics } from '../common/diagnostics.js';
+import { IDiagnosticInfo, IDiagnosticInfoOptions, IGPULogMessage, IMainProcessDiagnostics, IProcessDiagnostics, IRemoteDiagnosticError, IRemoteDiagnosticInfo, IWindowDiagnostics } from '../common/diagnostics.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
 import { ICodeWindow } from '../../window/electron-main/window.js';
 import { getAllWindowsExcludingOffscreen, IWindowsMainService } from '../../windows/electron-main/windows.js';
@@ -94,13 +94,24 @@ export class DiagnosticsMainService implements IDiagnosticsMainService {
 			pidToNames.push({ pid, name });
 		}
 
+		type AppWithGPULogMethod = typeof app & {
+			getGPULogMessages(): IGPULogMessage[];
+		};
+
+		let gpuLogMessages: IGPULogMessage[] = [];
+		const customApp = app as AppWithGPULogMethod;
+		if (typeof customApp.getGPULogMessages === 'function') {
+			gpuLogMessages = customApp.getGPULogMessages();
+		}
+
 		return {
 			mainPID: process.pid,
 			mainArguments: process.argv.slice(1),
 			windows,
 			pidToNames,
 			screenReader: !!app.accessibilitySupportEnabled,
-			gpuFeatureStatus: app.getGPUFeatureStatus()
+			gpuFeatureStatus: app.getGPUFeatureStatus(),
+			gpuLogMessages
 		};
 	}
 

src/vs/platform/diagnostics/node/diagnosticsService.ts

@@ -255,6 +255,12 @@ export class DiagnosticsService implements IDiagnosticsService {
 		output.push(`Screen Reader:    ${info.screenReader ? 'yes' : 'no'}`);
 		output.push(`Process Argv:     ${info.mainArguments.join(' ')}`);
 		output.push(`GPU Status:       ${this.expandGPUFeatures(info.gpuFeatureStatus)}`);
+		if (info.gpuLogMessages && info.gpuLogMessages.length > 0) {
+			output.push(`GPU Log Messages:`);
+			info.gpuLogMessages.forEach(msg => {
+				output.push(`${msg.header}: ${msg.message}`);
+			});
+		}
 
 		return output.join('\n');
 	}

src/vs/platform/environment/test/node/nativeModules.integrationTest.ts

@@ -50,9 +50,9 @@ flakySuite('Native Modules (all platforms)', () => {
 		assert.ok(result, testErrorMessage('native-keymap'));
 	});
 
-	test('native-watchdog', async () => {
-		const watchDog = await import('native-watchdog');
-		assert.ok(typeof watchDog.start === 'function', testErrorMessage('native-watchdog'));
+	test('@vscode/native-watchdog', async () => {
+		const watchDog = await import('@vscode/native-watchdog');
+		assert.ok(typeof watchDog.start === 'function', testErrorMessage('@vscode/native-watchdog'));
 	});
 
 	test('@vscode/sudo-prompt', async () => {

src/vs/workbench/api/node/extensionHostProcess.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import minimist from 'minimist';
-import * as nativeWatchdog from 'native-watchdog';
+import * as nativeWatchdog from '@vscode/native-watchdog';
 import * as net from 'net';
 import { ProcessTimeRunOnceScheduler } from '../../../base/common/async.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
@@ -375,7 +375,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
 				// So also use the native node module to do it from a separate thread
 				let watchdog: typeof nativeWatchdog;
 				try {
-					watchdog = require('native-watchdog');
+					watchdog = require('@vscode/native-watchdog');
 					watchdog.start(initData.parentPid);
 				} catch (err) {
 					// no problem...