Merge branch 'main' into fish-shell-integration

src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts

@@ -103,9 +103,9 @@ import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } fro
 import { PolicyChannelClient } from 'vs/platform/policy/common/policyIpc';
 import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy';
 import { UserDataProfilesNativeService } from 'vs/platform/userDataProfile/electron-sandbox/userDataProfile';
-import { OneDataSystemWebAppender } from 'vs/platform/telemetry/browser/1dsAppender';
 import { DefaultExtensionsProfileInitService } from 'vs/platform/extensionManagement/electron-sandbox/defaultExtensionsProfileInit';
 import { SharedProcessRequestService } from 'vs/platform/request/electron-browser/sharedProcessRequestService';
+import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
 
 class SharedProcessMain extends Disposable {
 
@@ -283,7 +283,7 @@ class SharedProcessMain extends Disposable {
 			appenders.push(logAppender);
 			const { installSourcePath } = environmentService;
 			if (productService.aiConfig?.ariaKey) {
-				const collectorAppender = new OneDataSystemWebAppender(internalTelemetry, 'monacoworkbench', null, productService.aiConfig.ariaKey);
+				const collectorAppender = new OneDataSystemAppender(internalTelemetry, 'monacoworkbench', null, productService.aiConfig.ariaKey);
 				this._register(toDisposable(() => collectorAppender.flush())); // Ensure the 1DS appender is disposed so that it flushes remaining data
 				appenders.push(collectorAppender);
 			}

src/vs/code/electron-sandbox/issue/issueReporterMain.ts

@@ -73,6 +73,7 @@ export class IssueReporter extends Disposable {
 
 		const targetExtension = configuration.data.extensionId ? configuration.data.enabledExtensions.find(extension => extension.id === configuration.data.extensionId) : undefined;
 		this.issueReporterModel = new IssueReporterModel({
+			...configuration.data,
 			issueType: configuration.data.issueType || IssueType.Bug,
 			versionInfo: {
 				vscodeVersion: `${configuration.product.nameShort} ${!!configuration.product.darwinUniversalAssetId ? `${configuration.product.version} (Universal)` : configuration.product.version} (${configuration.product.commit || 'Commit unknown'}, ${configuration.product.date || 'Date unknown'})`,
@@ -80,7 +81,7 @@ export class IssueReporter extends Disposable {
 			},
 			extensionsDisabled: !!configuration.disableExtensions,
 			fileOnExtension: configuration.data.extensionId ? !targetExtension?.isBuiltin : undefined,
-			selectedExtension: targetExtension,
+			selectedExtension: targetExtension
 		});
 
 		const issueReporterElement = this.getElementById('issue-reporter');

src/vs/code/electron-sandbox/processExplorer/media/processExplorer.css

@@ -84,3 +84,15 @@ body {
 	padding-left: 20px;
 	white-space: nowrap;
 }
+
+.monaco-scrollable-element .scrollbar > .slider {
+	background: #64646457 !important;
+}
+
+.monaco-scrollable-element .scrollbar > .slider:hover {
+	background: highlight !important;
+}
+
+.monaco-scrollable-element .scrollbar > .slider.active {
+	background: highlight !important;
+}

src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts

@@ -257,6 +257,7 @@ class ProcessExplorer {
 				await this.createProcessTree(processRoots);
 			} else {
 				this.tree.setInput({ processes: { processRoots } });
+				this.tree.layout(window.innerHeight, window.innerWidth);
 			}
 
 			this.requestProcessList(0);
@@ -342,6 +343,13 @@ class ProcessExplorer {
 				this.showContextMenu(e.element, true);
 			}
 		});
+
+		container.style.height = `${window.innerHeight}px`;
+
+		window.addEventListener('resize', () => {
+			container.style.height = `${window.innerHeight}px`;
+			this.tree?.layout(window.innerHeight, window.innerWidth);
+		});
 	}
 
 	private isDebuggable(cmd: string): boolean {