Merge remote-tracking branch 'upstream/main'

Author: enginelesscc

.eslintplugin/code-no-test-only.ts

@@ -9,10 +9,10 @@ export = new class NoTestOnly implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
-			['MemberExpression[object.name="test"][property.name="only"]']: (node: any) => {
+			['MemberExpression[object.name=/^(test|suite)$/][property.name="only"]']: (node: any) => {
 				return context.report({
 					node,
-					message: 'test.only is a dev-time tool and CANNOT be pushed'
+					message: 'only is a dev-time tool and CANNOT be pushed'
 				});
 			}
 		};

package.json

@@ -133,7 +133,7 @@
     "@vscode/l10n-dev": "0.0.21",
     "@vscode/telemetry-extractor": "^1.9.8",
     "@vscode/test-web": "^0.0.32",
-    "@vscode/vscode-perf": "^0.0.1",
+    "@vscode/vscode-perf": "^0.0.2",
     "ansi-colors": "^3.2.3",
     "asar": "^3.0.3",
     "chromium-pickle-js": "^0.2.0",

src/vs/workbench/api/browser/mainThreadNotebook.ts

@@ -44,28 +44,40 @@ export class MainThreadNotebooks implements MainThreadNotebookShape {
 	}
 
 	$registerNotebookSerializer(handle: number, extension: NotebookExtensionDescription, viewType: string, options: TransientOptions, data: INotebookContributionData | undefined): void {
-		const registration = this._notebookService.registerNotebookSerializer(viewType, extension, {
+		const disposables = new DisposableStore();
+
+		disposables.add(this._notebookService.registerNotebookSerializer(viewType, extension, {
 			options,
 			dataToNotebook: async (data: VSBuffer): Promise<NotebookData> => {
 				const sw = new StopWatch(true);
 				const dto = await this._proxy.$dataToNotebook(handle, data, CancellationToken.None);
 				const result = NotebookDto.fromNotebookDataDto(dto.value);
-				this._logService.trace('[NotebookSerializer] dataToNotebook DONE', extension.id, sw.elapsed());
+				this._logService.trace(`[NotebookSerializer] dataToNotebook DONE after ${sw.elapsed()}ms`, {
+					viewType,
+					extensionId: extension.id.value,
+				});
 				return result;
 			},
 			notebookToData: (data: NotebookData): Promise<VSBuffer> => {
 				const sw = new StopWatch(true);
 				const result = this._proxy.$notebookToData(handle, new SerializableObjectWithBuffers(NotebookDto.toNotebookDataDto(data)), CancellationToken.None);
-				this._logService.trace('[NotebookSerializer] notebookToData DONE', extension.id, sw.elapsed());
+				this._logService.trace(`[NotebookSerializer] notebookToData DONE after ${sw.elapsed()}`, {
+					viewType,
+					extensionId: extension.id.value,
+				});
 				return result;
 			}
-		});
-		const disposables = new DisposableStore();
-		disposables.add(registration);
+		}));
+
 		if (data) {
 			disposables.add(this._notebookService.registerContributedNotebookType(viewType, data));
 		}
 		this._notebookSerializer.set(handle, disposables);
+
+		this._logService.trace('[NotebookSerializer] registered notebook serializer', {
+			viewType,
+			extensionId: extension.id.value,
+		});
 	}
 
 	$unregisterNotebookSerializer(handle: number): void {

src/vs/workbench/browser/parts/editor/editorConfiguration.ts

@@ -137,7 +137,7 @@ export class DynamicEditorConfigurations extends Disposable implements IWorkbenc
 			properties: {
 				'workbench.editorAssociations': {
 					type: 'object',
-					markdownDescription: localize('editor.editorAssociations', "Configure glob patterns to editors (for example `\"*.hex\": \"hexEditor.hexEdit\"`). These have precedence over the default behavior."),
+					markdownDescription: localize('editor.editorAssociations', "Configure glob patterns to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."),
 					patternProperties: {
 						'.*': {
 							type: 'string',

src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts

@@ -30,14 +30,14 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
 import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IQuickInputButton, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
 import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { ContextKeyExpr, ContextKeyExpression, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { getVirtualWorkspaceLocation } from 'vs/platform/workspace/common/virtualWorkspace';
 import { Schemas } from 'vs/base/common/network';
 import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
-import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
+import { IExtensionService, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 import { EditSessionsLogService } from 'vs/workbench/contrib/editSessions/common/editSessionsLogService';
 import { IViewContainersRegistry, Extensions as ViewExtensions, ViewContainerLocation, IViewsService } from 'vs/workbench/common/views';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
@@ -61,10 +61,14 @@ import { ILocalizedString } from 'vs/platform/action/common/action';
 import { Codicon } from 'vs/base/common/codicons';
 import { CancellationError } from 'vs/base/common/errors';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { IExtensionsViewPaneContainer, VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
+import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
+
 
 registerSingleton(IEditSessionsLogService, EditSessionsLogService, InstantiationType.Delayed);
 registerSingleton(IEditSessionsStorageService, EditSessionsWorkbenchService, InstantiationType.Delayed);
 
+
 const continueWorkingOnCommand: IAction2Options = {
 	id: '_workbench.editSessions.actions.continueEditSession',
 	title: { value: localize('continue working on', "Continue Working On..."), original: 'Continue Working On...' },
@@ -82,6 +86,23 @@ const showOutputChannelCommand: IAction2Options = {
 	title: { value: localize('show log', 'Show Log'), original: 'Show Log' },
 	category: EDIT_SESSION_SYNC_CATEGORY
 };
+const installAdditionalContinueOnOptionsCommand = {
+	id: 'workbench.action.continueOn.extensions',
+	title: localize('continueOn.installAdditional', 'Install additional development environment options'),
+};
+registerAction2(class extends Action2 {
+	constructor() {
+		super({ ...installAdditionalContinueOnOptionsCommand, f1: false });
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const paneCompositePartService = accessor.get(IPaneCompositePartService);
+		const viewlet = await paneCompositePartService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
+		const view = viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer | undefined;
+		view?.search('@tag:continueOn');
+	}
+});
+
 const resumeProgressOptionsTitle = `[${localize('resuming working changes window', 'Resuming working changes...')}](command:${showOutputChannelCommand.id})`;
 const resumeProgressOptions = {
 	location: ProgressLocation.Window,
@@ -124,6 +145,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		@IActivityService private readonly activityService: IActivityService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
+		@IExtensionService private readonly extensionService: IExtensionService,
 	) {
 		super();
 
@@ -809,7 +831,8 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		if (remoteGroup !== undefined) {
 			MenuRegistry.appendMenuItem(MenuId.StatusBarRemoteIndicatorMenu, {
 				group: remoteGroup,
-				command: command
+				command: command,
+				when: command.precondition
 			});
 		}
 	}
@@ -851,14 +874,22 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			: this.contextService.getWorkspace().folders.map((folder) => folder.name).join(', ');
 		quickPick.placeholder = localize('continueEditSessionPick.title.v2', "Select a development environment to continue working on {0} in", `'${workspaceContext}'`);
 		quickPick.items = this.createPickItems();
+		this.extensionService.onDidChangeExtensions(() => {
+			quickPick.items = this.createPickItems();
+		});
 
 		const command = await new Promise<string | undefined>((resolve, reject) => {
 			quickPick.onDidHide(() => resolve(undefined));
 
 			quickPick.onDidAccept((e) => {
 				const selection = quickPick.activeItems[0].command;
-				resolve(selection);
-				quickPick.hide();
+
+				if (selection === installAdditionalContinueOnOptionsCommand.id) {
+					void this.commandService.executeCommand(installAdditionalContinueOnOptionsCommand.id);
+				} else {
+					resolve(selection);
+					quickPick.hide();
+				}
 			});
 
 			quickPick.show();
@@ -912,7 +943,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		}
 	}
 
-	private createPickItems(): ContinueEditSessionItem[] {
+	private createPickItems(): (ContinueEditSessionItem | IQuickPickSeparator)[] {
 		const items = [...this.continueEditSessionOptions].filter((option) => option.when === undefined || this.contextKeyService.contextMatchesRules(option.when));
 
 		if (getVirtualWorkspaceLocation(this.contextService.getWorkspace()) !== undefined && isNative) {
@@ -923,7 +954,8 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			));
 		}
 
-		return items.sort((item1, item2) => item1.label.localeCompare(item2.label));
+		const sortedItems: (ContinueEditSessionItem | IQuickPickSeparator)[] = items.sort((item1, item2) => item1.label.localeCompare(item2.label));
+		return sortedItems.concat({ type: 'separator' }, new ContinueEditSessionItem(installAdditionalContinueOnOptionsCommand.title, installAdditionalContinueOnOptionsCommand.id));
 	}
 }
 

src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts

@@ -41,6 +41,7 @@ import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 
 const folderName = 'test-folder';
 const folderUri = URI.file(`/${folderName}`);
@@ -75,6 +76,9 @@ suite('Edit session sync', () => {
 			override onDidSignIn = Event.None;
 			override onDidSignOut = Event.None;
 		});
+		instantiationService.stub(IExtensionService, new class extends mock<IExtensionService>() {
+			override onDidChangeExtensions = Event.None;
+		});
 		instantiationService.stub(IProgressService, ProgressService);
 		instantiationService.stub(ISCMService, SCMService);
 		instantiationService.stub(IEnvironmentService, TestEnvironmentService);

src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts

@@ -182,16 +182,6 @@ async function webviewPreloads(ctx: PreloadContext) {
 
 	document.body.addEventListener('click', handleInnerClick);
 
-	async function loadScriptSource(url: string, originalUri: string): Promise<string> {
-		const res = await fetch(url);
-		const text = await res.text();
-		if (!res.ok) {
-			throw new Error(`Unexpected ${res.status} requesting ${originalUri}: ${text || res.statusText}`);
-		}
-
-		return text;
-	}
-
 	interface RendererContext extends rendererApi.RendererContext<unknown> {
 		readonly settings: RenderOptions;
 	}
@@ -224,24 +214,9 @@ async function webviewPreloads(ctx: PreloadContext) {
 		});
 	}
 
-	const invokeSourceWithGlobals = (functionSrc: string, globals: { [name: string]: unknown }) => {
-		const args = Object.entries(globals);
-		return new Function(...args.map(([k]) => k), functionSrc)(...args.map(([, v]) => v));
-	};
-
-	async function runKernelPreload(url: string, originalUri: string, forceLoadAsModule: boolean): Promise<void> {
-		if (forceLoadAsModule) {
-			return activateModuleKernelPreload(url);
-		}
-
-		const text = await loadScriptSource(url, originalUri);
-		const isModule = /\bexport\b.*\bactivate\b/.test(text);
+	async function runKernelPreload(url: string): Promise<void> {
 		try {
-			if (isModule) {
-				return activateModuleKernelPreload(url);
-			} else {
-				return invokeSourceWithGlobals(text, { ...kernelPreloadGlobals, scriptUrl: url });
-			}
+			return await activateModuleKernelPreload(url);
 		} catch (e) {
 			console.error(e);
 			throw e;
@@ -818,12 +793,6 @@ async function webviewPreloads(ctx: PreloadContext) {
 
 	const onDidReceiveKernelMessage = createEmitter<unknown>();
 
-	const kernelPreloadGlobals = {
-		acquireVsCodeApi,
-		onDidReceiveKernelMessage: onDidReceiveKernelMessage.event,
-		postKernelMessage: (data: unknown) => postNotebookMessage('customKernelMessage', { message: data }),
-	};
-
 	const ttPolicy = window.trustedTypes?.createPolicy('notebookRenderer', {
 		createHTML: value => value,
 		createScript: value => value,
@@ -1209,8 +1178,8 @@ async function webviewPreloads(ctx: PreloadContext) {
 			}
 			case 'preload': {
 				const resources = event.data.resources;
-				for (const { uri, originalUri } of resources) {
-					kernelPreloads.load(uri, originalUri, false);
+				for (const { uri } of resources) {
+					kernelPreloads.load(uri);
 				}
 				break;
 			}
@@ -1462,9 +1431,9 @@ async function webviewPreloads(ctx: PreloadContext) {
 		 * @param uri URI to load from
 		 * @param originalUri URI to show in an error message if the preload is invalid.
 		 */
-		public load(uri: string, originalUri: string, forceLoadAsModule: boolean) {
+		public load(uri: string) {
 			const promise = Promise.all([
-				runKernelPreload(uri, originalUri, forceLoadAsModule),
+				runKernelPreload(uri),
 				this.waitForAllCurrent(),
 			]);
 
@@ -2229,7 +2198,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 	});
 
 	for (const preload of ctx.staticPreloadsData) {
-		kernelPreloads.load(preload.entrypoint, preload.entrypoint, true);
+		kernelPreloads.load(preload.entrypoint);
 	}
 
 	function postNotebookMessage<T extends webviewMessages.FromWebviewMessage>(

src/vs/workbench/contrib/search/common/searchModel.ts

@@ -24,6 +24,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IFileService, IFileStatWithPartialMetadata } from 'vs/platform/files/common/files';
 import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vs/platform/label/common/label';
+import { ILogService, LogLevel } from 'vs/platform/log/common/log';
 import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { minimapFindMatch, overviewRulerFindMatchForeground } from 'vs/platform/theme/common/colorRegistry';
@@ -864,6 +865,7 @@ export class FolderMatchWorkspaceRoot extends FolderMatchWithResource {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ILabelService labelService: ILabelService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
+		@ILogService private readonly _logService: ILogService,
 	) {
 		super(_resource, _id, _index, _query, _parent, _searchModel, null, replaceService, instantiationService, labelService, uriIdentityService);
 	}
@@ -894,15 +896,29 @@ export class FolderMatchWorkspaceRoot extends FolderMatchWithResource {
 		const normalizedResource = this.uriIdentityService.extUri.normalizePath(this.resource);
 		let uri = this.normalizedUriParent(rawFileMatch.resource);
 
+		const debug: string[] = ['[search model building]'];
+
+		if (this._logService.getLevel() === LogLevel.Trace) {
+			debug.push(`Starting with normalized resource ${normalizedResource}`);
+		}
+
 		while (!this.uriEquals(normalizedResource, uri)) {
 			fileMatchParentParts.unshift(uri);
 			const prevUri = uri;
 			uri = this.normalizedUriParent(uri);
+			if (this._logService.getLevel() === LogLevel.Trace) {
+				debug.push(`current uri parent ${uri} comparing with ${prevUri}`);
+			}
 			if (this.uriEquals(prevUri, uri)) {
+				this._logService.trace(debug.join('\n\n'));
 				throw Error(`${rawFileMatch.resource} is not correctly configured as a child of its ${normalizedResource}`);
 			}
 		}
 
+		if (this._logService.getLevel() === LogLevel.Trace) {
+			this._logService.trace(debug.join('\n\n'));
+		}
+
 		const root = this.closestRoot ?? this;
 		let parent: FolderMatch = this;
 		for (let i = 0; i < fileMatchParentParts.length; i++) {

src/vs/workbench/contrib/terminal/browser/terminal.ts

@@ -12,7 +12,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { IKeyMods } from 'vs/platform/quickinput/common/quickInput';
 import { IMarkProperties, ITerminalCapabilityStore, ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { IExtensionTerminalProfile, IReconnectionProperties, IShellIntegration, IShellLaunchConfig, ITerminalDimensions, ITerminalLaunchError, ITerminalProfile, ITerminalTabLayoutInfoById, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalShellType, TerminalType, TitleEventSource, WaitOnExitValue } from 'vs/platform/terminal/common/terminal';
-import { ITerminalQuickFixOptions } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { IEditableData } from 'vs/workbench/common/views';
@@ -931,11 +930,6 @@ export interface ITerminalInstance {
 	 */
 	openRecentLink(type: 'localFile' | 'url'): Promise<void>;
 
-	/**
-	 * Registers quick fix providers
-	 */
-	registerQuickFixProvider(...options: ITerminalQuickFixOptions[]): void;
-
 	/**
 	 * Attempts to detect and kill the process listening on specified port.
 	 * If successful, places commandToRun on the command line