Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

This reverts commit d15a3fcc98.

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

@@ -8,7 +8,7 @@ import { MainContext, MainThreadClipboardShape } from '../common/extHost.protoco
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 
 @extHostNamedCustomer(MainContext.MainThreadClipboard)
-export class MainThreadClipboard implements MainThreadClipboardShape {
+export class MainThreadCommands implements MainThreadClipboardShape {
 
 	constructor(
 		_context: any,

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

@@ -1,144 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { UriComponents, URI } from 'vs/base/common/uri';
-import * as modes from 'vs/editor/common/modes';
-import { MainContext, MainThreadEditorInsetsShape, IExtHostContext, ExtHostEditorInsetsShape, ExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer } from '../common/extHostCustomers';
-import { IRange } from 'vs/editor/common/core/range';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IWebviewService, Webview } from 'vs/workbench/contrib/webview/common/webview';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IActiveCodeEditor, IViewZone } from 'vs/editor/browser/editorBrowser';
-
-// todo@joh move these things back into something like contrib/insets
-class EditorWebviewZone implements IViewZone {
-
-	readonly domNode: HTMLElement;
-	readonly afterLineNumber: number;
-	readonly afterColumn: number;
-	readonly heightInLines: number;
-
-	private _id: number;
-	// suppressMouseDown?: boolean | undefined;
-	// heightInPx?: number | undefined;
-	// minWidthInPx?: number | undefined;
-	// marginDomNode?: HTMLElement | null | undefined;
-	// onDomNodeTop?: ((top: number) => void) | undefined;
-	// onComputedHeight?: ((height: number) => void) | undefined;
-
-	constructor(
-		readonly editor: IActiveCodeEditor,
-		readonly range: IRange,
-		readonly webview: Webview,
-	) {
-		this.domNode = document.createElement('div');
-		this.afterLineNumber = range.startLineNumber;
-		this.afterColumn = range.startColumn;
-		this.heightInLines = range.endLineNumber - range.startLineNumber;
-
-		editor.changeViewZones(accessor => this._id = accessor.addZone(this));
-		webview.mountTo(this.domNode);
-	}
-
-	dispose(): void {
-		this.editor.changeViewZones(accessor => accessor.removeZone(this._id));
-	}
-}
-
-@extHostNamedCustomer(MainContext.MainThreadEditorInsets)
-export class MainThreadEditorInsets implements MainThreadEditorInsetsShape {
-
-	private readonly _proxy: ExtHostEditorInsetsShape;
-	private readonly _disposables = new DisposableStore();
-	private readonly _insets = new Map<number, EditorWebviewZone>();
-
-	constructor(
-		context: IExtHostContext,
-		@ICodeEditorService private readonly _editorService: ICodeEditorService,
-		@IWebviewService private readonly _webviewService: IWebviewService,
-	) {
-		this._proxy = context.getProxy(ExtHostContext.ExtHostEditorInsets);
-	}
-
-	dispose(): void {
-		this._disposables.dispose();
-	}
-
-	async $createEditorInset(handle: number, id: string, uri: UriComponents, range: IRange, options: modes.IWebviewOptions): Promise<void> {
-
-		let editor: IActiveCodeEditor | undefined;
-		id = id.substr(0, id.indexOf(',')); //todo@joh HACK
-
-		for (const candidate of this._editorService.listCodeEditors()) {
-			if (candidate.getId() === id && candidate.hasModel() && candidate.getModel()!.uri.toString() === URI.revive(uri).toString()) {
-				editor = candidate;
-				break;
-			}
-		}
-
-		if (!editor) {
-			setTimeout(() => this._proxy.$onDidDispose(handle));
-			return;
-		}
-
-		const disposables = new DisposableStore();
-
-		const webview = this._webviewService.createWebview({
-			enableFindWidget: false,
-			allowSvgs: false,
-			extension: undefined
-		}, {
-				allowScripts: options.enableScripts
-			});
-
-		const webviewZone = new EditorWebviewZone(editor, range, webview);
-
-		const remove = () => {
-			disposables.dispose();
-			this._proxy.$onDidDispose(handle);
-			this._insets.delete(handle);
-		};
-
-		disposables.add(editor.onDidChangeModel(remove));
-		disposables.add(editor.onDidDispose(remove));
-		disposables.add(webviewZone);
-		disposables.add(webview);
-		disposables.add(webview.onMessage(msg => this._proxy.$onDidReceiveMessage(handle, msg)));
-
-		this._insets.set(handle, webviewZone);
-	}
-
-	$disposeEditorInset(handle: number): void {
-		const inset = this._insets.get(handle);
-		if (inset) {
-			this._insets.delete(handle);
-			inset.dispose();
-		}
-	}
-
-	$setHtml(handle: number, value: string): void {
-		const inset = this._insets.get(handle);
-		if (inset) {
-			inset.webview.html = value;
-		}
-	}
-
-	$setOptions(handle: number, options: modes.IWebviewOptions): void {
-		const inset = this._insets.get(handle);
-		if (inset) {
-			inset.webview.options = options;
-		}
-	}
-
-	$postMessage(handle: number, value: any): Promise<boolean> {
-		const inset = this._insets.get(handle);
-		if (inset) {
-			inset.webview.sendMessage(value);
-			return Promise.resolve(true);
-		}
-		return Promise.resolve(false);
-	}
-}

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

@@ -12,7 +12,7 @@ import { revive } from 'vs/base/common/marshalling';
 @extHostNamedCustomer(MainContext.MainThreadCommands)
 export class MainThreadCommands implements MainThreadCommandsShape {
 
-	private readonly _commandRegistrations = new Map<string, IDisposable>();
+	private readonly _disposables = new Map<string, IDisposable>();
 	private readonly _generateCommandsDocumentationRegistration: IDisposable;
 	private readonly _proxy: ExtHostCommandsShape;
 
@@ -26,8 +26,8 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 	}
 
 	dispose() {
-		this._commandRegistrations.forEach(value => value.dispose());
-		this._commandRegistrations.clear();
+		this._disposables.forEach(value => value.dispose());
+		this._disposables.clear();
 
 		this._generateCommandsDocumentationRegistration.dispose();
 	}
@@ -53,7 +53,7 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 	}
 
 	$registerCommand(id: string): void {
-		this._commandRegistrations.set(
+		this._disposables.set(
 			id,
 			CommandsRegistry.registerCommand(id, (accessor, ...args) => {
 				return this._proxy.$executeContributedCommand(id, ...args).then(result => {
@@ -64,10 +64,10 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 	}
 
 	$unregisterCommand(id: string): void {
-		const command = this._commandRegistrations.get(id);
+		const command = this._disposables.get(id);
 		if (command) {
 			command.dispose();
-			this._commandRegistrations.delete(id);
+			this._disposables.delete(id);
 		}
 	}
 

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

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ICodeEditor, isCodeEditor, isDiffEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import * as modes from 'vs/editor/common/modes';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
@@ -299,8 +299,7 @@ export class MainThreadCommentController {
 		this._features = features;
 	}
 
-	createCommentThread(extensionId: string,
-		commentThreadHandle: number,
+	createCommentThread(commentThreadHandle: number,
 		threadId: string,
 		resource: UriComponents,
 		range: IRange,
@@ -308,7 +307,7 @@ export class MainThreadCommentController {
 		let thread = new MainThreadCommentThread(
 			commentThreadHandle,
 			this.handle,
-			extensionId,
+			'',
 			threadId,
 			URI.revive(resource).toString(),
 			range
@@ -452,10 +451,6 @@ export class MainThreadCommentController {
 		this._proxy.$createCommentThreadTemplate(this.handle, resource, range);
 	}
 
-	async updateCommentThreadTemplate(threadHandle: number, range: IRange) {
-		await this._proxy.$updateCommentThreadTemplate(this.handle, threadHandle, range);
-	}
-
 	toJSON(): any {
 		return {
 			$mid: 6,
@@ -466,19 +461,16 @@ export class MainThreadCommentController {
 
 @extHostNamedCustomer(MainContext.MainThreadComments)
 export class MainThreadComments extends Disposable implements MainThreadCommentsShape {
+	private _disposables: IDisposable[];
+	private _activeCommentThreadDisposables: IDisposable[];
 	private readonly _proxy: ExtHostCommentsShape;
 	private _documentProviders = new Map<number, IDisposable>();
 	private _workspaceProviders = new Map<number, IDisposable>();
 	private _handlers = new Map<number, string>();
 	private _commentControllers = new Map<number, MainThreadCommentController>();
 
-	private _activeCommentThread?: MainThreadCommentThread;
-	private readonly _activeCommentThreadDisposables = this._register(new DisposableStore());
-	private _input?: modes.CommentInput;
-
 	private _openPanelListener: IDisposable | null;
 
-
 	constructor(
 		extHostContext: IExtHostContext,
 		@IEditorService private readonly _editorService: IEditorService,
@@ -488,27 +480,9 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) {
 		super();
+		this._disposables = [];
+		this._activeCommentThreadDisposables = [];
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostComments);
-
-		this._register(this._commentService.onDidChangeActiveCommentThread(async thread => {
-			let handle = (thread as MainThreadCommentThread).controllerHandle;
-			let controller = this._commentControllers.get(handle);
-
-			if (!controller) {
-				return;
-			}
-
-			this._activeCommentThreadDisposables.clear();
-			this._activeCommentThread = thread as MainThreadCommentThread;
-			controller.activeCommentThread = this._activeCommentThread;
-
-			this._activeCommentThreadDisposables.add(this._activeCommentThread.onDidChangeInput(input => { // todo, dispose
-				this._input = input;
-				this._proxy.$onCommentWidgetInputChange(handle, URI.parse(this._activeCommentThread!.resource), this._activeCommentThread!.range, this._input ? this._input.value : undefined);
-			}));
-
-			await this._proxy.$onCommentWidgetInputChange(controller.handle, URI.parse(this._activeCommentThread!.resource), this._activeCommentThread.range, this._input ? this._input.value : undefined);
-		}));
 	}
 
 	$registerCommentController(handle: number, id: string, label: string): void {
@@ -551,8 +525,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 		commentThreadHandle: number,
 		threadId: string,
 		resource: UriComponents,
-		range: IRange,
-		extensionId: ExtensionIdentifier
+		range: IRange
 	): modes.CommentThread2 | undefined {
 		let provider = this._commentControllers.get(handle);
 
@@ -560,7 +533,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 			return undefined;
 		}
 
-		return provider.createCommentThread(extensionId.value, commentThreadHandle, threadId, resource, range);
+		return provider.createCommentThread(commentThreadHandle, threadId, resource, range);
 	}
 
 	$updateCommentThread(handle: number,
@@ -780,7 +753,8 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 	}
 
 	dispose(): void {
-		super.dispose();
+		this._disposables = dispose(this._disposables);
+		this._activeCommentThreadDisposables = dispose(this._activeCommentThreadDisposables);
 		this._workspaceProviders.forEach(value => dispose(value));
 		this._workspaceProviders.clear();
 		this._documentProviders.forEach(value => dispose(value));

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

@@ -176,11 +176,11 @@ class MainThreadDocumentAndEditorStateComputer {
 	}
 
 	private _onDidAddEditor(e: ICodeEditor): void {
-		this._toDisposeOnEditorRemove.set(e.getId(), combinedDisposable(
+		this._toDisposeOnEditorRemove.set(e.getId(), combinedDisposable([
 			e.onDidChangeModel(() => this._updateState()),
 			e.onDidFocusEditorText(() => this._updateState()),
 			e.onDidFocusEditorWidget(() => this._updateState(e))
-		));
+		]));
 		this._updateState();
 	}
 

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

@@ -5,19 +5,27 @@
 
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { MainContext, MainThreadKeytarShape, IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
-import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
-import { optional } from 'vs/platform/instantiation/common/instantiation';
+
+interface IKeytarModule {
+	getPassword(service: string, account: string): Promise<string | null>;
+	setPassword(service: string, account: string, password: string): Promise<void>;
+	deletePassword(service: string, account: string): Promise<boolean>;
+	findPassword(service: string): Promise<string | null>;
+}
 
 @extHostNamedCustomer(MainContext.MainThreadKeytar)
 export class MainThreadKeytar implements MainThreadKeytarShape {
 
-	private readonly _credentialsService?: ICredentialsService;
+	private _keytar: IKeytarModule | null;
 
 	constructor(
-		_extHostContext: IExtHostContext,
-		@optional(ICredentialsService) credentialsService: ICredentialsService,
+		extHostContext: IExtHostContext
 	) {
-		this._credentialsService = credentialsService;
+		try {
+			this._keytar = <IKeytarModule>require.__$__nodeRequire('keytar');
+		} catch (e) {
+			this._keytar = null;
+		}
 	}
 
 	dispose(): void {
@@ -25,28 +33,28 @@ export class MainThreadKeytar implements MainThreadKeytarShape {
 	}
 
 	async $getPassword(service: string, account: string): Promise<string | null> {
-		if (this._credentialsService) {
-			return this._credentialsService.getPassword(service, account);
+		if (this._keytar) {
+			return this._keytar.getPassword(service, account);
 		}
 		return null;
 	}
 
 	async $setPassword(service: string, account: string, password: string): Promise<void> {
-		if (this._credentialsService) {
-			return this._credentialsService.setPassword(service, account, password);
+		if (this._keytar) {
+			return this._keytar.setPassword(service, account, password);
 		}
 	}
 
 	async $deletePassword(service: string, account: string): Promise<boolean> {
-		if (this._credentialsService) {
-			return this._credentialsService.deletePassword(service, account);
+		if (this._keytar) {
+			return this._keytar.deletePassword(service, account);
 		}
 		return false;
 	}
 
 	async $findPassword(service: string): Promise<string | null> {
-		if (this._credentialsService) {
-			return this._credentialsService.findPassword(service);
+		if (this._keytar) {
+			return this._keytar.findPassword(service);
 		}
 		return null;
 	}

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

@@ -11,29 +11,34 @@ import * as search from 'vs/workbench/contrib/search/common/search';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Position as EditorPosition } from 'vs/editor/common/core/position';
 import { Range as EditorRange, IRange } from 'vs/editor/common/core/range';
-import { ExtHostContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, MainContext, IExtHostContext, ISerializedLanguageConfiguration, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, LocationDto, WorkspaceSymbolDto, reviveWorkspaceEditDto, ISerializedDocumentFilter, DefinitionLinkDto, ISerializedSignatureHelpProviderMetadata, LinkDto, CallHierarchyDto, SuggestDataDto, CodeActionDto } from '../common/extHost.protocol';
+import { ExtHostContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, MainContext, IExtHostContext, ISerializedLanguageConfiguration, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, LocationDto, WorkspaceSymbolDto, CodeActionDto, reviveWorkspaceEditDto, ISerializedDocumentFilter, DefinitionLinkDto, ISerializedSignatureHelpProviderMetadata, CodeInsetDto, LinkDto, CallHierarchyDto, SuggestDataDto } from '../common/extHost.protocol';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { LanguageConfiguration, IndentationRule, OnEnterRule } from 'vs/editor/common/modes/languageConfiguration';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { URI } from 'vs/base/common/uri';
 import { Selection } from 'vs/editor/common/core/selection';
+import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import * as callh from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
+import { IHeapService } from 'vs/workbench/services/heap/common/heap';
 import { mixin } from 'vs/base/common/objects';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguageFeatures)
 export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesShape {
 
 	private readonly _proxy: ExtHostLanguageFeaturesShape;
+	private readonly _heapService: IHeapService;
 	private readonly _modeService: IModeService;
 	private readonly _registrations: { [handle: number]: IDisposable; } = Object.create(null);
 
 	constructor(
 		extHostContext: IExtHostContext,
+		@IHeapService heapService: IHeapService,
 		@IModeService modeService: IModeService,
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostLanguageFeatures);
+		this._heapService = heapService;
 		this._modeService = modeService;
 	}
 
@@ -96,7 +101,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		}
 	}
 
-	private static _reviveCodeActionDto(data: ReadonlyArray<CodeActionDto>): modes.CodeAction[] {
+	private static _reviveCodeActionDto(data: CodeActionDto[] | undefined): modes.CodeAction[] {
 		if (data) {
 			data.forEach(code => reviveWorkspaceEditDto(code.edit));
 		}
@@ -135,19 +140,25 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerCodeLensSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number | undefined): void {
 
 		const provider = <modes.CodeLensProvider>{
-			provideCodeLenses: (model: ITextModel, token: CancellationToken): Promise<modes.CodeLensList | undefined> => {
-				return this._proxy.$provideCodeLenses(handle, model.uri, token).then(listDto => {
-					if (!listDto) {
-						return undefined;
+			provideCodeLenses: (model: ITextModel, token: CancellationToken): modes.ICodeLensSymbol[] | Promise<modes.ICodeLensSymbol[]> => {
+				return this._proxy.$provideCodeLenses(handle, model.uri, token).then(dto => {
+					if (dto) {
+						dto.forEach(obj => {
+							this._heapService.trackObject(obj);
+							this._heapService.trackObject(obj.command);
+						});
 					}
-					return {
-						lenses: listDto.lenses,
-						dispose: () => listDto.cacheId && this._proxy.$releaseCodeLenses(handle, listDto.cacheId)
-					};
+					return dto;
 				});
 			},
-			resolveCodeLens: (_model: ITextModel, codeLens: modes.CodeLens, token: CancellationToken): Promise<modes.CodeLens | undefined> => {
-				return this._proxy.$resolveCodeLens(handle, codeLens, token);
+			resolveCodeLens: (_model: ITextModel, codeLens: modes.ICodeLensSymbol, token: CancellationToken): Promise<modes.ICodeLensSymbol | undefined> => {
+				return this._proxy.$resolveCodeLens(handle, codeLens, token).then(obj => {
+					if (obj) {
+						this._heapService.trackObject(obj);
+						this._heapService.trackObject(obj.command);
+					}
+					return obj;
+				});
 			}
 		};
 
@@ -167,6 +178,35 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		}
 	}
 
+	// -- code inset
+
+	$registerCodeInsetSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number): void {
+
+		const provider = <codeInset.CodeInsetProvider>{
+			provideCodeInsets: (model: ITextModel, token: CancellationToken): CodeInsetDto[] | Thenable<CodeInsetDto[]> => {
+				return this._proxy.$provideCodeInsets(handle, model.uri, token).then(dto => {
+					if (dto) { dto.forEach(obj => this._heapService.trackObject(obj)); }
+					return dto;
+				});
+			},
+			resolveCodeInset: (model: ITextModel, codeInset: CodeInsetDto, token: CancellationToken): CodeInsetDto | Thenable<CodeInsetDto> => {
+				return this._proxy.$resolveCodeInset(handle, model.uri, codeInset, token).then(obj => {
+					this._heapService.trackObject(obj);
+					return obj;
+				});
+			}
+		};
+
+		if (typeof eventHandle === 'number') {
+			const emitter = new Emitter<codeInset.CodeInsetProvider>();
+			this._registrations[eventHandle] = emitter;
+			provider.onDidChange = emitter.event;
+		}
+
+		const langSelector = selector;
+		this._registrations[handle] = codeInset.CodeInsetProviderRegistry.register(langSelector, provider);
+	}
+
 	// --- declaration
 
 	$registerDefinitionSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
@@ -235,19 +275,13 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerQuickFixSupport(handle: number, selector: ISerializedDocumentFilter[], providedCodeActionKinds?: string[]): void {
 		this._registrations[handle] = modes.CodeActionProviderRegistry.register(selector, <modes.CodeActionProvider>{
-			provideCodeActions: async (model: ITextModel, rangeOrSelection: EditorRange | Selection, context: modes.CodeActionContext, token: CancellationToken): Promise<modes.CodeActionList | undefined> => {
-				const listDto = await this._proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, context, token);
-				if (!listDto) {
-					return undefined;
-				}
-				return <modes.CodeActionList>{
-					actions: MainThreadLanguageFeatures._reviveCodeActionDto(listDto.actions),
-					dispose: () => {
-						if (typeof listDto.cacheId === 'number') {
-							this._proxy.$releaseCodeActions(handle, listDto.cacheId);
-						}
+			provideCodeActions: (model: ITextModel, rangeOrSelection: EditorRange | Selection, context: modes.CodeActionContext, token: CancellationToken): Promise<modes.CodeAction[]> => {
+				return this._proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, context, token).then(dto => {
+					if (dto) {
+						dto.forEach(obj => { this._heapService.trackObject(obj.command); });
 					}
-				};
+					return MainThreadLanguageFeatures._reviveCodeActionDto(dto);
+				});
 			},
 			providedCodeActionKinds
 		});

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

@@ -90,8 +90,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 			// if promise has not been resolved yet, now is the time to ensure a return value
 			// otherwise if already resolved it means the user clicked one of the buttons
 			Event.once(messageHandle.onDidClose)(() => {
-				dispose(primaryActions);
-				dispose(secondaryActions);
+				dispose(...primaryActions, ...secondaryActions);
 				resolve(undefined);
 			});
 		});

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

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProgress, IProgressService, IProgressStep, ProgressLocation, IProgressOptions, IProgressNotificationOptions } from 'vs/platform/progress/common/progress';
+import { IProgress, IProgressService2, IProgressStep, ProgressLocation, IProgressOptions, IProgressNotificationOptions } from 'vs/platform/progress/common/progress';
 import { MainThreadProgressShape, MainContext, IExtHostContext, ExtHostProgressShape, ExtHostContext } from '../common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { Action } from 'vs/base/common/actions';
@@ -22,13 +22,13 @@ class ManageExtensionAction extends Action {
 @extHostNamedCustomer(MainContext.MainThreadProgress)
 export class MainThreadProgress implements MainThreadProgressShape {
 
-	private readonly _progressService: IProgressService;
+	private readonly _progressService: IProgressService2;
 	private _progress = new Map<number, { resolve: () => void, progress: IProgress<IProgressStep> }>();
 	private readonly _proxy: ExtHostProgressShape;
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IProgressService progressService: IProgressService,
+		@IProgressService2 progressService: IProgressService2,
 		@ICommandService private readonly _commandService: ICommandService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostProgress);

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

@@ -28,7 +28,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { extHostCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 // {{SQL CARBON EDIT}}
@@ -299,10 +299,10 @@ class CodeActionOnSaveParticipant implements ISaveParticipant {
 					if (CodeActionKind.SourceFixAll.contains(b)) {
 						return 0;
 					}
-					return -1;
+					return 1;
 				}
 				if (CodeActionKind.SourceFixAll.contains(b)) {
-					return 1;
+					return -1;
 				}
 				return 0;
 			});
@@ -334,8 +334,6 @@ class CodeActionOnSaveParticipant implements ISaveParticipant {
 				await this.applyCodeActions(actionsToRun.actions);
 			} catch {
 				// Failure to apply a code action should not block other on save actions
-			} finally {
-				actionsToRun.dispose();
 			}
 		}
 	}
@@ -393,7 +391,7 @@ export class SaveParticipant implements ISaveParticipant {
 	constructor(
 		extHostContext: IExtHostContext,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IProgressService private readonly _progressService: IProgressService,
+		@IProgressService2 private readonly _progressService: IProgressService2,
 		@ILogService private readonly _logService: ILogService
 	) {
 		this._saveParticipants = new IdleValue(() => [

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

@@ -3,10 +3,11 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor, IStatusbarEntry } from 'vs/platform/statusbar/common/statusbar';
+import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment, IStatusbarEntryAccessor } from 'vs/platform/statusbar/common/statusbar';
 import { MainThreadStatusBarShape, MainContext, IExtHostContext } from '../common/extHost.protocol';
 import { ThemeColor } from 'vs/platform/theme/common/themeService';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
+import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { dispose } from 'vs/base/common/lifecycle';
 
 @extHostNamedCustomer(MainContext.MainThreadStatusBar)
@@ -24,8 +25,8 @@ export class MainThreadStatusBar implements MainThreadStatusBarShape {
 		this.entries.clear();
 	}
 
-	$setEntry(id: number, statusId: string, statusName: string, text: string, tooltip: string, command: string, color: string | ThemeColor, alignment: MainThreadStatusBarAlignment, priority: number): void {
-		const entry: IStatusbarEntry = { text, tooltip, command, color };
+	$setEntry(id: number, extensionId: ExtensionIdentifier, text: string, tooltip: string, command: string, color: string | ThemeColor, alignment: MainThreadStatusBarAlignment, priority: number): void {
+		const entry = { text, tooltip, command, color, extensionId };
 
 		// Reset existing entry if alignment or priority changed
 		let existingEntry = this.entries.get(id);
@@ -37,7 +38,7 @@ export class MainThreadStatusBar implements MainThreadStatusBarShape {
 
 		// Create new entry if not existing
 		if (!existingEntry) {
-			this.entries.set(id, { accessor: this.statusbarService.addEntry(entry, statusId, statusName, alignment, priority), alignment, priority });
+			this.entries.set(id, { accessor: this.statusbarService.addEntry(entry, alignment, priority), alignment, priority });
 		}
 
 		// Otherwise update

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

@@ -62,7 +62,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		// when the extension host process goes down ?
 	}
 
-	public $createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string, cwd?: string | UriComponents, env?: { [key: string]: string }, waitOnExit?: boolean, strictEnv?: boolean, runInBackground?: boolean): Promise<{ id: number, name: string }> {
+	public $createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string, cwd?: string | UriComponents, env?: { [key: string]: string }, waitOnExit?: boolean, strictEnv?: boolean): Promise<{ id: number, name: string }> {
 		const shellLaunchConfig: IShellLaunchConfig = {
 			name,
 			executable: shellPath,
@@ -71,8 +71,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			waitOnExit,
 			ignoreConfigurationCwd: true,
 			env,
-			strictEnv,
-			runInBackground
+			strictEnv
 		};
 		const terminal = this.terminalService.createTerminal(shellLaunchConfig);
 		return Promise.resolve({

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

@@ -13,6 +13,7 @@ import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IFileMatch, IPatternInfo, ISearchProgressItem, ISearchService } from 'vs/workbench/services/search/common/search';
+import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { IWorkspaceContextService, WorkbenchState, IWorkspace } from 'vs/platform/workspace/common/workspace';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
@@ -23,7 +24,6 @@ import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common
 import { ExtHostContext, ExtHostWorkspaceShape, IExtHostContext, MainContext, MainThreadWorkspaceShape, IWorkspaceData, ITextSearchComplete } from '../common/extHost.protocol';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { isEqualOrParent } from 'vs/base/common/resources';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
 export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@@ -39,7 +39,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@ITextFileService private readonly _textFileService: ITextFileService,
 		@IWorkspaceEditingService private readonly _workspaceEditingService: IWorkspaceEditingService,
-		@INotificationService private readonly _notificationService: INotificationService,
+		@IStatusbarService private readonly _statusbarService: IStatusbarService,
 		@IWindowService private readonly _windowService: IWindowService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ILabelService private readonly _labelService: ILabelService,
@@ -66,7 +66,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		const workspaceFoldersToAdd = foldersToAdd.map(f => ({ uri: URI.revive(f.uri), name: f.name }));
 
 		// Indicate in status message
-		this._notificationService.status(this.getStatusMessage(extensionName, workspaceFoldersToAdd.length, deleteCount), { hideAfter: 10 * 1000 /* 10s */ });
+		this._statusbarService.setStatusMessage(this.getStatusMessage(extensionName, workspaceFoldersToAdd.length, deleteCount), 10 * 1000 /* 10s */);
 
 		return this._workspaceEditingService.updateFolders(index, deleteCount, workspaceFoldersToAdd, true);
 	}

src/vs/workbench/api/common/extHost.protocol.ts

@@ -42,6 +42,7 @@ import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { ResolvedAuthority, RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset';
 import * as callHierarchy from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { IRelativePattern } from 'vs/base/common/glob';
 import { IRemoteConsoleLog } from 'vs/base/common/console';
@@ -139,7 +140,7 @@ export interface MainThreadCommentsShape extends IDisposable {
 	$registerCommentController(handle: number, id: string, label: string): void;
 	$unregisterCommentController(handle: number): void;
 	$updateCommentControllerFeatures(handle: number, features: CommentProviderFeatures): void;
-	$createCommentThread(handle: number, commentThreadHandle: number, threadId: string, resource: UriComponents, range: IRange, extensionId: ExtensionIdentifier): modes.CommentThread2 | undefined;
+	$createCommentThread(handle: number, commentThreadHandle: number, threadId: string, resource: UriComponents, range: IRange): modes.CommentThread2 | undefined;
 	$updateCommentThread(handle: number, commentThreadHandle: number, threadId: string, resource: UriComponents, range: IRange, label: string, contextValue: string | undefined, comments: modes.Comment[], acceptInputCommand: modes.Command | undefined, additionalCommands: modes.Command[], deleteCommand: modes.Command | undefined, collapseState: modes.CommentThreadCollapsibleState): void;
 	$deleteCommentThread(handle: number, commentThreadHandle: number): void;
 	$setInputValue(handle: number, input: string): void;
@@ -335,6 +336,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
 	$unregister(handle: number): void;
 	$registerDocumentSymbolProvider(handle: number, selector: ISerializedDocumentFilter[], label: string): void;
 	$registerCodeLensSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number | undefined): void;
+	$registerCodeInsetSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number | undefined): void;
 	$emitCodeLensEvent(eventHandle: number, event?: any): void;
 	$registerDefinitionSupport(handle: number, selector: ISerializedDocumentFilter[]): void;
 	$registerDeclarationSupport(handle: number, selector: ISerializedDocumentFilter[]): void;
@@ -391,7 +393,7 @@ export interface MainThreadProgressShape extends IDisposable {
 }
 
 export interface MainThreadTerminalServiceShape extends IDisposable {
-	$createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string, cwd?: string | UriComponents, env?: { [key: string]: string | null }, waitOnExit?: boolean, strictEnv?: boolean, runInBackground?: boolean): Promise<{ id: number, name: string }>;
+	$createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string, cwd?: string | UriComponents, env?: { [key: string]: string | null }, waitOnExit?: boolean, strictEnv?: boolean): Promise<{ id: number, name: string }>;
 	$createTerminalRenderer(name: string): Promise<number>;
 	$dispose(terminalId: number): void;
 	$hide(terminalId: number): void;
@@ -498,7 +500,7 @@ export interface MainThreadQuickOpenShape extends IDisposable {
 }
 
 export interface MainThreadStatusBarShape extends IDisposable {
-	$setEntry(id: number, statusId: string, statusName: string, text: string, tooltip: string, command: string, color: string | ThemeColor, alignment: statusbar.StatusbarAlignment, priority: number | undefined): void;
+	$setEntry(id: number, extensionId: ExtensionIdentifier | undefined, text: string, tooltip: string, command: string, color: string | ThemeColor, alignment: statusbar.StatusbarAlignment, priority: number | undefined): void;
 	$dispose(id: number): void;
 }
 
@@ -511,22 +513,10 @@ export interface MainThreadTelemetryShape extends IDisposable {
 	$publicLog(eventName: string, data?: any): void;
 }
 
-export interface MainThreadEditorInsetsShape extends IDisposable {
-	$createEditorInset(handle: number, editorId: string, document: UriComponents, range: IRange, options: modes.IWebviewOptions): Promise<void>;
-	$disposeEditorInset(handle: number): void;
-
-	$setHtml(handle: number, value: string): void;
-	$setOptions(handle: number, options: modes.IWebviewOptions): void;
-	$postMessage(handle: number, value: any): Promise<boolean>;
-}
-
-export interface ExtHostEditorInsetsShape {
-	$onDidDispose(handle: number): void;
-	$onDidReceiveMessage(handle: number, message: any): void;
-}
-
 export type WebviewPanelHandle = string;
 
+export type WebviewInsetHandle = number;
+
 export interface WebviewPanelShowOptions {
 	readonly viewColumn?: EditorViewColumn;
 	readonly preserveFocus?: boolean;
@@ -534,14 +524,15 @@ export interface WebviewPanelShowOptions {
 
 export interface MainThreadWebviewsShape extends IDisposable {
 	$createWebviewPanel(handle: WebviewPanelHandle, viewType: string, title: string, showOptions: WebviewPanelShowOptions, options: modes.IWebviewPanelOptions & modes.IWebviewOptions, extensionId: ExtensionIdentifier, extensionLocation: UriComponents): void;
+	$createWebviewCodeInset(handle: WebviewInsetHandle, symbolId: string, options: modes.IWebviewOptions, extensionId: ExtensionIdentifier | undefined, extensionLocation: UriComponents | undefined): void;
 	$disposeWebview(handle: WebviewPanelHandle): void;
 	$reveal(handle: WebviewPanelHandle, showOptions: WebviewPanelShowOptions): void;
 	$setTitle(handle: WebviewPanelHandle, value: string): void;
 	$setIconPath(handle: WebviewPanelHandle, value: { light: UriComponents, dark: UriComponents } | undefined): void;
 
-	$setHtml(handle: WebviewPanelHandle, value: string): void;
-	$setOptions(handle: WebviewPanelHandle, options: modes.IWebviewOptions): void;
-	$postMessage(handle: WebviewPanelHandle, value: any): Promise<boolean>;
+	$setHtml(handle: WebviewPanelHandle | WebviewInsetHandle, value: string): void;
+	$setOptions(handle: WebviewPanelHandle | WebviewInsetHandle, options: modes.IWebviewOptions): void;
+	$postMessage(handle: WebviewPanelHandle | WebviewInsetHandle, value: any): Promise<boolean>;
 
 	$registerSerializer(viewType: string): void;
 	$unregisterSerializer(viewType: string): void;
@@ -997,11 +988,6 @@ export interface CodeActionDto {
 	isPreferred?: boolean;
 }
 
-export interface CodeActionListDto {
-	cacheId: number;
-	actions: ReadonlyArray<CodeActionDto>;
-}
-
 export type CacheId = number;
 export type ChainedCacheId = [CacheId, CacheId];
 
@@ -1014,20 +1000,16 @@ export interface LinkDto {
 	cacheId?: ChainedCacheId;
 	range: IRange;
 	url?: string | UriComponents;
-	tooltip?: string;
 }
 
-export interface CodeLensListDto {
-	cacheId?: number;
-	lenses: CodeLensDto[];
-}
-
-export interface CodeLensDto {
-	cacheId?: ChainedCacheId;
+export interface CodeLensDto extends ObjectIdentifier {
 	range: IRange;
+	id?: string;
 	command?: CommandDto;
 }
 
+export type CodeInsetDto = ObjectIdentifier & codeInset.ICodeInsetSymbol;
+
 export interface CallHierarchyDto {
 	_id: number;
 	kind: modes.SymbolKind;
@@ -1040,9 +1022,10 @@ export interface CallHierarchyDto {
 
 export interface ExtHostLanguageFeaturesShape {
 	$provideDocumentSymbols(handle: number, resource: UriComponents, token: CancellationToken): Promise<modes.DocumentSymbol[] | undefined>;
-	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Promise<CodeLensListDto | undefined>;
+	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Promise<CodeLensDto[]>;
 	$resolveCodeLens(handle: number, symbol: CodeLensDto, token: CancellationToken): Promise<CodeLensDto | undefined>;
-	$releaseCodeLenses(handle: number, id: number): void;
+	$provideCodeInsets(handle: number, resource: UriComponents, token: CancellationToken): Promise<CodeInsetDto[] | undefined>;
+	$resolveCodeInset(handle: number, resource: UriComponents, symbol: CodeInsetDto, token: CancellationToken): Promise<CodeInsetDto>;
 	$provideDefinition(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<DefinitionLinkDto[]>;
 	$provideDeclaration(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<DefinitionLinkDto[]>;
 	$provideImplementation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<DefinitionLinkDto[]>;
@@ -1050,8 +1033,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$provideHover(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.Hover | undefined>;
 	$provideDocumentHighlights(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Promise<modes.DocumentHighlight[] | undefined>;
 	$provideReferences(handle: number, resource: UriComponents, position: IPosition, context: modes.ReferenceContext, token: CancellationToken): Promise<LocationDto[] | undefined>;
-	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Promise<CodeActionListDto | undefined>;
-	$releaseCodeActions(handle: number, cacheId: number): void;
+	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Promise<CodeActionDto[] | undefined>;
 	$provideDocumentFormattingEdits(handle: number, resource: UriComponents, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[] | undefined>;
 	$provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: IRange, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[] | undefined>;
 	$provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: IPosition, ch: string, options: modes.FormattingOptions, token: CancellationToken): Promise<ISingleEditOperation[] | undefined>;
@@ -1230,7 +1212,6 @@ export interface ExtHostCommentsShape {
 	$provideDocumentComments(handle: number, document: UriComponents): Promise<modes.CommentInfo | null>;
 	$createNewCommentThread(handle: number, document: UriComponents, range: IRange, text: string): Promise<modes.CommentThread | null>;
 	$createCommentThreadTemplate(commentControllerHandle: number, uriComponents: UriComponents, range: IRange): void;
-	$updateCommentThreadTemplate(commentControllerHandle: number, threadHandle: number, range: IRange): Promise<void>;
 	$onCommentWidgetInputChange(commentControllerHandle: number, document: UriComponents, range: IRange, input: string | undefined): Promise<number | undefined>;
 	$deleteCommentThread(commentControllerHandle: number, commentThreadHandle: number): void;
 	$provideCommentingRanges(commentControllerHandle: number, uriComponents: UriComponents, token: CancellationToken): Promise<IRange[] | undefined>;
@@ -1268,7 +1249,6 @@ export const MainContext = {
 	MainThreadDocuments: createMainId<MainThreadDocumentsShape>('MainThreadDocuments'),
 	MainThreadDocumentContentProviders: createMainId<MainThreadDocumentContentProvidersShape>('MainThreadDocumentContentProviders'),
 	MainThreadTextEditors: createMainId<MainThreadTextEditorsShape>('MainThreadTextEditors'),
-	MainThreadEditorInsets: createMainId<MainThreadEditorInsetsShape>('MainThreadEditorInsets'),
 	MainThreadErrors: createMainId<MainThreadErrorsShape>('MainThreadErrors'),
 	MainThreadTreeViews: createMainId<MainThreadTreeViewsShape>('MainThreadTreeViews'),
 	MainThreadKeytar: createMainId<MainThreadKeytarShape>('MainThreadKeytar'),
@@ -1319,7 +1299,6 @@ export const ExtHostContext = {
 	ExtHostWorkspace: createExtId<ExtHostWorkspaceShape>('ExtHostWorkspace'),
 	ExtHostWindow: createExtId<ExtHostWindowShape>('ExtHostWindow'),
 	ExtHostWebviews: createExtId<ExtHostWebviewsShape>('ExtHostWebviews'),
-	ExtHostEditorInsets: createExtId<ExtHostEditorInsetsShape>('ExtHostEditorInsets'),
 	ExtHostProgress: createMainId<ExtHostProgressShape>('ExtHostProgress'),
 	ExtHostComments: createMainId<ExtHostCommentsShape>('ExtHostComments'),
 	ExtHostStorage: createMainId<ExtHostStorageShape>('ExtHostStorage'),

src/vs/workbench/api/common/extHostApiCommands.ts

@@ -504,7 +504,7 @@ export class ExtHostApiCommands {
 
 	private _executeCodeLensProvider(resource: URI, itemResolveCount: number): Promise<vscode.CodeLens[] | undefined> {
 		const args = { resource, itemResolveCount };
-		return this._commands.executeCommand<modes.CodeLens[]>('_executeCodeLensProvider', args)
+		return this._commands.executeCommand<modes.ICodeLensSymbol[]>('_executeCodeLensProvider', args)
 			.then(tryMapWith(item => {
 				return new types.CodeLens(
 					typeConverters.Range.to(item.range),

src/vs/workbench/api/common/extHostCodeInsets.ts

@@ -1,130 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Emitter } from 'vs/base/common/event';
-import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import * as vscode from 'vscode';
-import { MainThreadEditorInsetsShape } from './extHost.protocol';
-import { ExtHostEditors } from 'vs/workbench/api/common/extHostTextEditors';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { ExtHostTextEditor } from 'vs/workbench/api/common/extHostTextEditor';
-
-export class ExtHostEditorInsets implements ExtHostEditorInsets {
-
-	private _handlePool = 0;
-	private _disposables = new DisposableStore();
-	private _insets = new Map<number, { editor: vscode.TextEditor, inset: vscode.WebviewEditorInset, onDidReceiveMessage: Emitter<any> }>();
-
-	constructor(
-		private readonly _proxy: MainThreadEditorInsetsShape,
-		private readonly _editors: ExtHostEditors
-	) {
-
-		// dispose editor inset whenever the hosting editor goes away
-		this._disposables.add(_editors.onDidChangeVisibleTextEditors(() => {
-			const visibleEditor = _editors.getVisibleTextEditors();
-			this._insets.forEach(value => {
-				if (visibleEditor.indexOf(value.editor) < 0) {
-					value.inset.dispose(); // will remove from `this._insets`
-				}
-			});
-		}));
-	}
-
-	dispose(): void {
-		this._insets.forEach(value => value.inset.dispose());
-		this._disposables.dispose();
-	}
-
-	createWebviewEditorInset(editor: vscode.TextEditor, range: vscode.Range, options?: vscode.WebviewOptions): vscode.WebviewEditorInset {
-
-		let apiEditor: ExtHostTextEditor | undefined;
-		for (const candidate of this._editors.getVisibleTextEditors()) {
-			if (candidate === editor) {
-				apiEditor = <ExtHostTextEditor>candidate;
-				break;
-			}
-		}
-		if (!apiEditor) {
-			throw new Error('not a visible editor');
-		}
-
-		const that = this;
-		const handle = this._handlePool++;
-		const onDidReceiveMessage = new Emitter<any>();
-		const onDidDispose = new Emitter<void>();
-
-		const webview = new class implements vscode.Webview {
-
-			private _html: string = '';
-			private _options: vscode.WebviewOptions;
-
-			set options(value: vscode.WebviewOptions) {
-				this._options = value;
-				that._proxy.$setOptions(handle, value);
-			}
-
-			get options(): vscode.WebviewOptions {
-				return this._options;
-			}
-
-			set html(value: string) {
-				this._html = value;
-				that._proxy.$setHtml(handle, value);
-			}
-
-			get html(): string {
-				return this._html;
-			}
-
-			get onDidReceiveMessage(): vscode.Event<any> {
-				return onDidReceiveMessage.event;
-			}
-
-			postMessage(message: any): Thenable<boolean> {
-				return that._proxy.$postMessage(handle, message);
-			}
-		};
-
-		const inset = new class implements vscode.WebviewEditorInset {
-
-			readonly editor: vscode.TextEditor = editor;
-			readonly range: vscode.Range = range;
-			readonly webview: vscode.Webview = webview;
-			readonly onDidDispose: vscode.Event<void> = onDidDispose.event;
-
-			dispose(): void {
-				if (that._insets.has(handle)) {
-					that._insets.delete(handle);
-					that._proxy.$disposeEditorInset(handle);
-					onDidDispose.fire();
-
-					// final cleanup
-					onDidDispose.dispose();
-					onDidReceiveMessage.dispose();
-				}
-			}
-		};
-
-		this._proxy.$createEditorInset(handle, apiEditor.id, apiEditor.document.uri, typeConverters.Range.from(range), options || {});
-		this._insets.set(handle, { editor, inset, onDidReceiveMessage });
-
-		return inset;
-	}
-
-	$onDidDispose(handle: number): void {
-		const value = this._insets.get(handle);
-		if (value) {
-			value.inset.dispose();
-		}
-	}
-
-	$onDidReceiveMessage(handle: number, message: any): void {
-		const value = this._insets.get(handle);
-		if (value) {
-			value.onDidReceiveMessage.fire(message);
-		}
-	}
-}

src/vs/workbench/api/common/extHostCommands.ts

@@ -18,7 +18,6 @@ import { revive } from 'vs/base/common/marshalling';
 import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import { URI } from 'vs/base/common/uri';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 
 interface CommandHandler {
 	callback: Function;
@@ -212,35 +211,6 @@ export class CommandsConverter {
 		this._commands.registerCommand(true, this._delegatingCommandId, this._executeConvertedCommand, this);
 	}
 
-	toInternal2(command: vscode.Command | undefined, disposables: DisposableStore): CommandDto | undefined {
-
-		if (!command) {
-			return undefined;
-		}
-
-		const result: CommandDto = {
-			$ident: undefined,
-			id: command.command,
-			title: command.title,
-			tooltip: command.tooltip
-		};
-
-		if (command.command && isNonEmptyArray(command.arguments)) {
-			// we have a contributed command with arguments. that
-			// means we don't want to send the arguments around
-
-			const id = this._heap.keep(command);
-			disposables.add(toDisposable(() => this._heap.delete(id)));
-			result.$ident = id;
-
-			result.id = this._delegatingCommandId;
-			result.arguments = [id];
-
-		}
-
-		return result;
-	}
-
 	toInternal(command: vscode.Command): CommandDto;
 	toInternal(command: undefined): undefined;
 	toInternal(command: vscode.Command | undefined): CommandDto | undefined;

src/vs/workbench/api/common/extHostComments.ts

@@ -162,16 +162,6 @@ export class ExtHostComments implements ExtHostCommentsShape {
 		commentController.$createCommentThreadTemplate(uriComponents, range);
 	}
 
-	async $updateCommentThreadTemplate(commentControllerHandle: number, threadHandle: number, range: IRange) {
-		const commentController = this._commentControllers.get(commentControllerHandle);
-
-		if (!commentController) {
-			return;
-		}
-
-		commentController.$updateCommentThreadTemplate(threadHandle, range);
-	}
-
 	$onCommentWidgetInputChange(commentControllerHandle: number, uriComponents: UriComponents, range: IRange, input: string): Promise<number | undefined> {
 		const commentController = this._commentControllers.get(commentControllerHandle);
 
@@ -592,8 +582,7 @@ export class ExtHostCommentThread implements vscode.CommentThread {
 		private _id: string | undefined,
 		private _uri: vscode.Uri,
 		private _range: vscode.Range,
-		private _comments: vscode.Comment[],
-		extensionId: ExtensionIdentifier
+		private _comments: vscode.Comment[]
 	) {
 		if (this._id === undefined) {
 			this._id = `${_commentController.id}.${this.handle}`;
@@ -604,8 +593,7 @@ export class ExtHostCommentThread implements vscode.CommentThread {
 			this.handle,
 			this._id,
 			this._uri,
-			extHostTypeConverter.Range.from(this._range),
-			extensionId
+			extHostTypeConverter.Range.from(this._range)
 		);
 
 		this._localDisposables = [];
@@ -753,7 +741,7 @@ class ExtHostCommentController implements vscode.CommentController {
 	}
 
 	constructor(
-		private _extension: IExtensionDescription,
+		_extension: IExtensionDescription,
 		private _handle: number,
 		private readonly _commandsConverter: CommandsConverter,
 		private _proxy: MainThreadCommentsShape,
@@ -767,30 +755,23 @@ class ExtHostCommentController implements vscode.CommentController {
 	createCommentThread(id: string, resource: vscode.Uri, range: vscode.Range, comments: vscode.Comment[]): vscode.CommentThread;
 	createCommentThread(arg0: vscode.Uri | string, arg1: vscode.Uri | vscode.Range, arg2: vscode.Range | vscode.Comment[], arg3?: vscode.Comment[]): vscode.CommentThread {
 		if (typeof arg0 === 'string') {
-			const commentThread = new ExtHostCommentThread(this._proxy, this._commandsConverter, this, arg0, arg1 as vscode.Uri, arg2 as vscode.Range, arg3 as vscode.Comment[], this._extension.identifier);
+			const commentThread = new ExtHostCommentThread(this._proxy, this._commandsConverter, this, arg0, arg1 as vscode.Uri, arg2 as vscode.Range, arg3 as vscode.Comment[]);
 			this._threads.set(commentThread.handle, commentThread);
 			return commentThread;
 		} else {
-			const commentThread = new ExtHostCommentThread(this._proxy, this._commandsConverter, this, undefined, arg0 as vscode.Uri, arg1 as vscode.Range, arg2 as vscode.Comment[], this._extension.identifier);
+			const commentThread = new ExtHostCommentThread(this._proxy, this._commandsConverter, this, undefined, arg0 as vscode.Uri, arg1 as vscode.Range, arg2 as vscode.Comment[]);
 			this._threads.set(commentThread.handle, commentThread);
 			return commentThread;
 		}
 	}
 
 	$createCommentThreadTemplate(uriComponents: UriComponents, range: IRange) {
-		const commentThread = new ExtHostCommentThread(this._proxy, this._commandsConverter, this, undefined, URI.revive(uriComponents), extHostTypeConverter.Range.to(range), [], this._extension.identifier);
+		const commentThread = new ExtHostCommentThread(this._proxy, this._commandsConverter, this, undefined, URI.revive(uriComponents), extHostTypeConverter.Range.to(range), []);
 		commentThread.collapsibleState = modes.CommentThreadCollapsibleState.Expanded;
 		this._threads.set(commentThread.handle, commentThread);
 		return commentThread;
 	}
 
-	$updateCommentThreadTemplate(threadHandle: number, range: IRange) {
-		let thread = this._threads.get(threadHandle);
-		if (thread) {
-			thread.range = extHostTypeConverter.Range.to(range);
-		}
-	}
-
 	$deleteCommentThread(threadHandle: number) {
 		let thread = this._threads.get(threadHandle);
 

src/vs/workbench/api/common/extHostLanguageFeatures.ts

@@ -15,7 +15,7 @@ import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
 import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
 import { ExtHostDiagnostics } from 'vs/workbench/api/common/extHostDiagnostics';
 import { asPromise } from 'vs/base/common/async';
-import { MainContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, ObjectIdentifier, IRawColorInfo, IMainContext, IdObject, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, ISerializedLanguageConfiguration, WorkspaceSymbolDto, SuggestResultDto, WorkspaceSymbolsDto, CodeActionDto, ISerializedDocumentFilter, WorkspaceEditDto, ISerializedSignatureHelpProviderMetadata, LinkDto, CodeLensDto, SuggestDataDto, LinksListDto, ChainedCacheId, CodeLensListDto, CodeActionListDto } from './extHost.protocol';
+import { MainContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, ObjectIdentifier, IRawColorInfo, IMainContext, IdObject, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, ISerializedLanguageConfiguration, WorkspaceSymbolDto, SuggestResultDto, WorkspaceSymbolsDto, CodeActionDto, ISerializedDocumentFilter, WorkspaceEditDto, ISerializedSignatureHelpProviderMetadata, LinkDto, CodeLensDto, MainThreadWebviewsShape, CodeInsetDto, SuggestDataDto, LinksListDto, ChainedCacheId } from './extHost.protocol';
 import { regExpLeadsToEndlessLoop, regExpFlags } from 'vs/base/common/strings';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IRange, Range as EditorRange } from 'vs/editor/common/core/range';
@@ -25,10 +25,11 @@ import { ISelection, Selection } from 'vs/editor/common/core/selection';
 import { ILogService } from 'vs/platform/log/common/log';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { ExtHostWebview } from 'vs/workbench/api/common/extHostWebview';
+import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset';
+import { generateUuid } from 'vs/base/common/uuid';
 import * as callHierarchy from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { LRUCache } from 'vs/base/common/map';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { DisposableStore, dispose } from 'vs/base/common/lifecycle';
 
 // --- adapter
 
@@ -103,48 +104,34 @@ class CodeLensAdapter {
 
 	private static _badCmd: vscode.Command = { command: 'missing', title: '!!MISSING: command!!' };
 
-	private readonly _cache = new Cache<vscode.CodeLens>();
-	private readonly _disposables = new Map<number, DisposableStore>();
-
 	constructor(
 		private readonly _documents: ExtHostDocuments,
 		private readonly _commands: CommandsConverter,
+		private readonly _heapService: ExtHostHeapService,
 		private readonly _provider: vscode.CodeLensProvider
 	) { }
 
-	provideCodeLenses(resource: URI, token: CancellationToken): Promise<CodeLensListDto | undefined> {
+	provideCodeLenses(resource: URI, token: CancellationToken): Promise<CodeLensDto[]> {
 		const doc = this._documents.getDocument(resource);
 
 		return asPromise(() => this._provider.provideCodeLenses(doc, token)).then(lenses => {
-
-			if (!lenses || token.isCancellationRequested) {
-				return undefined;
+			const result: CodeLensDto[] = [];
+			if (isNonEmptyArray(lenses)) {
+				for (const lens of lenses) {
+					const id = this._heapService.keep(lens);
+					result.push(ObjectIdentifier.mixin({
+						range: typeConvert.Range.from(lens.range),
+						command: this._commands.toInternal(lens.command)
+					}, id));
+				}
 			}
-
-			const cacheId = this._cache.add(lenses);
-			const disposables = new DisposableStore();
-			this._disposables.set(cacheId, disposables);
-
-			const result: CodeLensListDto = {
-				cacheId,
-				lenses: [],
-			};
-
-			for (let i = 0; i < lenses.length; i++) {
-				result.lenses.push({
-					cacheId: [cacheId, i],
-					range: typeConvert.Range.from(lenses[i].range),
-					command: this._commands.toInternal2(lenses[i].command, disposables)
-				});
-			}
-
 			return result;
 		});
 	}
 
 	resolveCodeLens(symbol: CodeLensDto, token: CancellationToken): Promise<CodeLensDto | undefined> {
 
-		const lens = symbol.cacheId && this._cache.get(...symbol.cacheId);
+		const lens = this._heapService.get<vscode.CodeLens>(ObjectIdentifier.of(symbol));
 		if (!lens) {
 			return Promise.resolve(undefined);
 		}
@@ -157,26 +144,51 @@ class CodeLensAdapter {
 		}
 
 		return resolve.then(newLens => {
-			if (token.isCancellationRequested) {
-				return undefined;
-			}
-
-			const disposables = symbol.cacheId && this._disposables.get(symbol.cacheId[0]);
-			if (!disposables) {
-				// We've already been disposed of
-				return undefined;
-			}
-
 			newLens = newLens || lens;
-			symbol.command = this._commands.toInternal2(newLens.command || CodeLensAdapter._badCmd, disposables);
+			symbol.command = this._commands.toInternal(newLens.command || CodeLensAdapter._badCmd);
 			return symbol;
 		});
 	}
+}
 
-	releaseCodeLenses(cachedId: number): void {
-		dispose(this._disposables.get(cachedId));
-		this._disposables.delete(cachedId);
-		this._cache.delete(cachedId);
+class CodeInsetAdapter {
+
+	constructor(
+		private readonly _documents: ExtHostDocuments,
+		private readonly _heapService: ExtHostHeapService,
+		private readonly _provider: vscode.CodeInsetProvider
+	) { }
+
+	provideCodeInsets(resource: URI, token: CancellationToken): Promise<CodeInsetDto[] | undefined> {
+		const doc = this._documents.getDocument(resource);
+		return asPromise(() => this._provider.provideCodeInsets(doc, token)).then(insets => {
+			if (Array.isArray(insets)) {
+				return insets.map(inset => {
+					const $ident = this._heapService.keep(inset);
+					const id = generateUuid();
+					return {
+						$ident,
+						id,
+						range: typeConvert.Range.from(inset.range),
+						height: inset.height
+					};
+				});
+			}
+			return undefined;
+		});
+	}
+
+	resolveCodeInset(symbol: CodeInsetDto, webview: vscode.Webview, token: CancellationToken): Promise<CodeInsetDto> {
+
+		const inset = this._heapService.get<vscode.CodeInset>(ObjectIdentifier.of(symbol));
+		if (!inset) {
+			return Promise.resolve(symbol);
+		}
+
+		return asPromise(() => this._provider.resolveCodeInset(inset, webview, token)).then(newInset => {
+			newInset = newInset || inset;
+			return symbol;
+		});
 	}
 }
 
@@ -316,9 +328,6 @@ export interface CustomCodeAction extends CodeActionDto {
 class CodeActionAdapter {
 	private static readonly _maxCodeActionsPerFile: number = 1000;
 
-	private readonly _cache = new Cache<vscode.CodeAction | vscode.Command>();
-	private readonly _disposables = new Map<number, DisposableStore>();
-
 	constructor(
 		private readonly _documents: ExtHostDocuments,
 		private readonly _commands: CommandsConverter,
@@ -328,7 +337,7 @@ class CodeActionAdapter {
 		private readonly _extensionId: ExtensionIdentifier
 	) { }
 
-	provideCodeActions(resource: URI, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Promise<CodeActionListDto | undefined> {
+	provideCodeActions(resource: URI, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Promise<CodeActionDto[] | undefined> {
 
 		const doc = this._documents.getDocument(resource);
 		const ran = Selection.isISelection(rangeOrSelection)
@@ -351,39 +360,34 @@ class CodeActionAdapter {
 		};
 
 		return asPromise(() => this._provider.provideCodeActions(doc, ran, codeActionContext, token)).then(commandsOrActions => {
-			if (!isNonEmptyArray(commandsOrActions) || token.isCancellationRequested) {
+			if (!isNonEmptyArray(commandsOrActions)) {
 				return undefined;
 			}
-
-			const cacheId = this._cache.add(commandsOrActions);
-			const disposables = new DisposableStore();
-			this._disposables.set(cacheId, disposables);
-
-			const actions: CustomCodeAction[] = [];
+			const result: CustomCodeAction[] = [];
 			for (const candidate of commandsOrActions) {
 				if (!candidate) {
 					continue;
 				}
 				if (CodeActionAdapter._isCommand(candidate)) {
 					// old school: synthetic code action
-					actions.push({
+					result.push({
 						_isSynthetic: true,
 						title: candidate.title,
-						command: this._commands.toInternal2(candidate, disposables),
+						command: this._commands.toInternal(candidate),
 					});
 				} else {
 					if (codeActionContext.only) {
 						if (!candidate.kind) {
 							this._logService.warn(`${this._extensionId.value} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
 						} else if (!codeActionContext.only.contains(candidate.kind)) {
-							this._logService.warn(`${this._extensionId.value} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
+							this._logService.warn(`${this._extensionId.value} -Code actions of kind '${codeActionContext.only.value} 'requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
 						}
 					}
 
 					// new school: convert code action
-					actions.push({
+					result.push({
 						title: candidate.title,
-						command: candidate.command && this._commands.toInternal2(candidate.command, disposables),
+						command: candidate.command && this._commands.toInternal(candidate.command),
 						diagnostics: candidate.diagnostics && candidate.diagnostics.map(typeConvert.Diagnostic.from),
 						edit: candidate.edit && typeConvert.WorkspaceEdit.from(candidate.edit),
 						kind: candidate.kind && candidate.kind.value,
@@ -392,16 +396,10 @@ class CodeActionAdapter {
 				}
 			}
 
-			return <CodeActionListDto>{ cacheId, actions };
+			return result;
 		});
 	}
 
-	public releaseCodeActions(cachedId: number): void {
-		dispose(this._disposables.get(cachedId));
-		this._disposables.delete(cachedId);
-		this._cache.delete(cachedId);
-	}
-
 	private static _isCommand(thing: any): thing is vscode.Command {
 		return typeof (<vscode.Command>thing).command === 'string' && typeof (<vscode.Command>thing).title === 'string';
 	}
@@ -626,7 +624,6 @@ class SuggestAdapter {
 	private _provider: vscode.CompletionItemProvider;
 
 	private _cache = new Cache<vscode.CompletionItem>();
-	private _disposables = new Map<number, DisposableStore>();
 
 	constructor(documents: ExtHostDocuments, commands: CommandsConverter, provider: vscode.CompletionItemProvider) {
 		this._documents = documents;
@@ -646,18 +643,13 @@ class SuggestAdapter {
 				return undefined;
 			}
 
-			if (token.isCancellationRequested) {
-				// cancelled -> return without further ado, esp no caching
-				// of results as they will leak
-				return undefined;
-			}
-
-			const list = Array.isArray(value) ? new CompletionList(value) : value;
+			let list = Array.isArray(value) ? new CompletionList(value) : value;
+			let pid: number | undefined;
 
 			// keep result for providers that support resolving
-			const pid: number = SuggestAdapter.supportsResolving(this._provider) ? this._cache.add(list.items) : this._cache.add([]);
-			const disposables = new DisposableStore();
-			this._disposables.set(pid, disposables);
+			if (SuggestAdapter.supportsResolving(this._provider)) {
+				pid = this._cache.add(list.items);
+			}
 
 			// the default text edit range
 			const wordRangeBeforePos = (doc.getWordRangeAtPosition(pos) as Range || new Range(pos, pos))
@@ -671,7 +663,7 @@ class SuggestAdapter {
 			};
 
 			for (let i = 0; i < list.items.length; i++) {
-				const suggestion = this._convertCompletionItem(list.items[i], pos, [pid, i]);
+				const suggestion = this._convertCompletionItem(list.items[i], pos, pid && [pid, i] || undefined);
 				// check for bad completion item
 				// for the converter did warn
 				if (suggestion) {
@@ -706,22 +698,15 @@ class SuggestAdapter {
 	}
 
 	releaseCompletionItems(id: number): any {
-		dispose(this._disposables.get(id));
-		this._disposables.delete(id);
 		this._cache.delete(id);
 	}
 
-	private _convertCompletionItem(item: vscode.CompletionItem, position: vscode.Position, id: ChainedCacheId): SuggestDataDto | undefined {
+	private _convertCompletionItem(item: vscode.CompletionItem, position: vscode.Position, id: ChainedCacheId | undefined): SuggestDataDto | undefined {
 		if (typeof item.label !== 'string' || item.label.length === 0) {
 			console.warn('INVALID text edit -> must have at least a label');
 			return undefined;
 		}
 
-		const disposables = this._disposables.get(id[0]);
-		if (!disposables) {
-			throw Error('DisposableStore is missing...');
-		}
-
 		const result: SuggestDataDto = {
 			//
 			x: id,
@@ -736,7 +721,7 @@ class SuggestAdapter {
 			i: item.keepWhitespace ? modes.CompletionItemInsertTextRule.KeepWhitespace : 0,
 			k: item.commitCharacters,
 			l: item.additionalTextEdits && item.additionalTextEdits.map(typeConvert.TextEdit.from),
-			m: this._commands.toInternal2(item.command, disposables),
+			m: this._commands.toInternal(item.command),
 		};
 
 		// 'insertText'-logic
@@ -846,12 +831,6 @@ class LinkProviderAdapter {
 				return undefined;
 			}
 
-			if (token.isCancellationRequested) {
-				// cancelled -> return without further ado, esp no caching
-				// of results as they will leak
-				return undefined;
-			}
-
 			if (typeof this._provider.resolveDocumentLink !== 'function') {
 				// no resolve -> no caching
 				return { links: links.map(typeConvert.DocumentLink.from) };
@@ -1048,7 +1027,7 @@ type Adapter = DocumentSymbolAdapter | CodeLensAdapter | DefinitionAdapter | Hov
 	| DocumentHighlightAdapter | ReferenceAdapter | CodeActionAdapter | DocumentFormattingAdapter
 	| RangeFormattingAdapter | OnTypeFormattingAdapter | NavigateTypeAdapter | RenameAdapter
 	| SuggestAdapter | SignatureHelpAdapter | LinkProviderAdapter | ImplementationAdapter | TypeDefinitionAdapter
-	| ColorProviderAdapter | FoldingProviderAdapter | DeclarationAdapter | SelectionRangeAdapter | CallHierarchyAdapter;
+	| ColorProviderAdapter | FoldingProviderAdapter | CodeInsetAdapter | DeclarationAdapter | SelectionRangeAdapter | CallHierarchyAdapter;
 
 class AdapterData {
 	constructor(
@@ -1057,11 +1036,15 @@ class AdapterData {
 	) { }
 }
 
+export interface ISchemeTransformer {
+	transformOutgoing(scheme: string): string;
+}
+
 export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 
 	private static _handlePool: number = 0;
 
-	private readonly _uriTransformer: IURITransformer | null;
+	private readonly _schemeTransformer: ISchemeTransformer | null;
 	private _proxy: MainThreadLanguageFeaturesShape;
 	private _documents: ExtHostDocuments;
 	private _commands: ExtHostCommands;
@@ -1069,23 +1052,25 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 	private _diagnostics: ExtHostDiagnostics;
 	private _adapter = new Map<number, AdapterData>();
 	private readonly _logService: ILogService;
+	private _webviewProxy: MainThreadWebviewsShape;
 
 	constructor(
 		mainContext: IMainContext,
-		uriTransformer: IURITransformer | null,
+		schemeTransformer: ISchemeTransformer | null,
 		documents: ExtHostDocuments,
 		commands: ExtHostCommands,
 		heapMonitor: ExtHostHeapService,
 		diagnostics: ExtHostDiagnostics,
 		logService: ILogService
 	) {
-		this._uriTransformer = uriTransformer;
+		this._schemeTransformer = schemeTransformer;
 		this._proxy = mainContext.getProxy(MainContext.MainThreadLanguageFeatures);
 		this._documents = documents;
 		this._commands = commands;
 		this._heapService = heapMonitor;
 		this._diagnostics = diagnostics;
 		this._logService = logService;
+		this._webviewProxy = mainContext.getProxy(MainContext.MainThreadWebviews);
 	}
 
 	private _transformDocumentSelector(selector: vscode.DocumentSelector): Array<ISerializedDocumentFilter> {
@@ -1114,8 +1099,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 	}
 
 	private _transformScheme(scheme: string | undefined): string | undefined {
-		if (this._uriTransformer && typeof scheme === 'string') {
-			return this._uriTransformer.transformOutgoingScheme(scheme);
+		if (this._schemeTransformer && typeof scheme === 'string') {
+			return this._schemeTransformer.transformOutgoing(scheme);
 		}
 		return scheme;
 	}
@@ -1188,7 +1173,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		const handle = this._nextHandle();
 		const eventHandle = typeof provider.onDidChangeCodeLenses === 'function' ? this._nextHandle() : undefined;
 
-		this._adapter.set(handle, new AdapterData(new CodeLensAdapter(this._documents, this._commands.converter, provider), extension));
+		this._adapter.set(handle, new AdapterData(new CodeLensAdapter(this._documents, this._commands.converter, this._heapService, provider), extension));
 		this._proxy.$registerCodeLensSupport(handle, this._transformDocumentSelector(selector), eventHandle);
 		let result = this._createDisposable(handle);
 
@@ -1200,16 +1185,43 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return result;
 	}
 
-	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Promise<CodeLensListDto | undefined> {
-		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.provideCodeLenses(URI.revive(resource), token), undefined);
+	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Promise<modes.ICodeLensSymbol[]> {
+		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.provideCodeLenses(URI.revive(resource), token), []);
 	}
 
-	$resolveCodeLens(handle: number, symbol: CodeLensDto, token: CancellationToken): Promise<CodeLensDto | undefined> {
+	$resolveCodeLens(handle: number, symbol: modes.ICodeLensSymbol, token: CancellationToken): Promise<modes.ICodeLensSymbol | undefined> {
 		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.resolveCodeLens(symbol, token), undefined);
 	}
 
-	$releaseCodeLenses(handle: number, cacheId: number): void {
-		this._withAdapter(handle, CodeLensAdapter, adapter => Promise.resolve(adapter.releaseCodeLenses(cacheId)), undefined);
+	// --- code insets
+
+	registerCodeInsetProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.CodeInsetProvider): vscode.Disposable {
+		const handle = this._nextHandle();
+		const eventHandle = typeof provider.onDidChangeCodeInsets === 'function' ? this._nextHandle() : undefined;
+
+		this._adapter.set(handle, new AdapterData(new CodeInsetAdapter(this._documents, this._heapService, provider), extension));
+		this._proxy.$registerCodeInsetSupport(handle, this._transformDocumentSelector(selector), eventHandle);
+		let result = this._createDisposable(handle);
+
+		if (eventHandle !== undefined && provider.onDidChangeCodeInsets) {
+			const subscription = provider.onDidChangeCodeInsets(_ => this._proxy.$emitCodeLensEvent(eventHandle));
+			result = Disposable.from(result, subscription);
+		}
+
+		return result;
+	}
+
+	$provideCodeInsets(handle: number, resource: UriComponents, token: CancellationToken): Promise<codeInset.ICodeInsetSymbol[] | undefined> {
+		return this._withAdapter(handle, CodeInsetAdapter, adapter => adapter.provideCodeInsets(URI.revive(resource), token), undefined);
+	}
+
+	$resolveCodeInset(handle: number, _resource: UriComponents, symbol: codeInset.ICodeInsetSymbol, token: CancellationToken): Promise<codeInset.ICodeInsetSymbol> {
+		const webviewHandle = Math.random();
+		const webview = new ExtHostWebview(webviewHandle, this._webviewProxy, { enableScripts: true });
+		return this._withAdapter(handle, CodeInsetAdapter, async (adapter, extension) => {
+			await this._webviewProxy.$createWebviewCodeInset(webviewHandle, symbol.id, { enableCommandUris: true, enableScripts: true }, extension ? extension.identifier : undefined, extension ? extension.extensionLocation : undefined);
+			return adapter.resolveCodeInset(symbol, webview, token);
+		}, symbol);
 	}
 
 	// --- declaration
@@ -1299,14 +1311,10 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 	}
 
 
-	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Promise<CodeActionListDto | undefined> {
+	$provideCodeActions(handle: number, resource: UriComponents, rangeOrSelection: IRange | ISelection, context: modes.CodeActionContext, token: CancellationToken): Promise<CodeActionDto[] | undefined> {
 		return this._withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeActions(URI.revive(resource), rangeOrSelection, context, token), undefined);
 	}
 
-	$releaseCodeActions(handle: number, cacheId: number): void {
-		this._withAdapter(handle, CodeActionAdapter, adapter => Promise.resolve(adapter.releaseCodeActions(cacheId)), undefined);
-	}
-
 	// --- formatting
 
 	registerDocumentFormattingEditProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.DocumentFormattingEditProvider): vscode.Disposable {

src/vs/workbench/api/common/extHostStatusBar.ts

@@ -7,7 +7,7 @@ import { StatusbarAlignment as MainThreadStatusBarAlignment } from 'vs/platform/
 import { StatusBarAlignment as ExtHostStatusBarAlignment, Disposable, ThemeColor } from './extHostTypes';
 import { StatusBarItem, StatusBarAlignment } from 'vscode';
 import { MainContext, MainThreadStatusBarShape, IMainContext } from './extHost.protocol';
-import { localize } from 'vs/nls';
+import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 
 export class ExtHostStatusBarEntry implements StatusBarItem {
 	private static ID_GEN = 0;
@@ -18,9 +18,6 @@ export class ExtHostStatusBarEntry implements StatusBarItem {
 	private _disposed: boolean;
 	private _visible: boolean;
 
-	private _statusId: string;
-	private _statusName: string;
-
 	private _text: string;
 	private _tooltip: string;
 	private _color: string | ThemeColor;
@@ -29,13 +26,14 @@ export class ExtHostStatusBarEntry implements StatusBarItem {
 	private _timeoutHandle: any;
 	private _proxy: MainThreadStatusBarShape;
 
-	constructor(proxy: MainThreadStatusBarShape, id: string, name: string, alignment: ExtHostStatusBarAlignment = ExtHostStatusBarAlignment.Left, priority?: number) {
+	private _extensionId?: ExtensionIdentifier;
+
+	constructor(proxy: MainThreadStatusBarShape, extensionId: ExtensionIdentifier | undefined, alignment: ExtHostStatusBarAlignment = ExtHostStatusBarAlignment.Left, priority?: number) {
 		this._id = ExtHostStatusBarEntry.ID_GEN++;
 		this._proxy = proxy;
-		this._statusId = id;
-		this._statusName = name;
 		this._alignment = alignment;
 		this._priority = priority;
+		this._extensionId = extensionId;
 	}
 
 	public get id(): number {
@@ -109,7 +107,7 @@ export class ExtHostStatusBarEntry implements StatusBarItem {
 			this._timeoutHandle = undefined;
 
 			// Set to status bar
-			this._proxy.$setEntry(this.id, this._statusId, this._statusName, this.text, this.tooltip, this.command, this.color,
+			this._proxy.$setEntry(this.id, this._extensionId, this.text, this.tooltip, this.command, this.color,
 				this._alignment === ExtHostStatusBarAlignment.Left ? MainThreadStatusBarAlignment.LEFT : MainThreadStatusBarAlignment.RIGHT,
 				this._priority);
 		}, 0);
@@ -127,7 +125,7 @@ class StatusBarMessage {
 	private _messages: { message: string }[] = [];
 
 	constructor(statusBar: ExtHostStatusBar) {
-		this._item = statusBar.createStatusBarEntry('status.extensionMessage', localize('status.extensionMessage', "Extension Status"), ExtHostStatusBarAlignment.Left, Number.MIN_VALUE);
+		this._item = statusBar.createStatusBarEntry(undefined, ExtHostStatusBarAlignment.Left, Number.MIN_VALUE);
 	}
 
 	dispose() {
@@ -169,8 +167,8 @@ export class ExtHostStatusBar {
 		this._statusMessage = new StatusBarMessage(this);
 	}
 
-	createStatusBarEntry(id: string, name: string, alignment?: ExtHostStatusBarAlignment, priority?: number): StatusBarItem {
-		return new ExtHostStatusBarEntry(this._proxy, id, name, alignment, priority);
+	createStatusBarEntry(extensionId: ExtensionIdentifier | undefined, alignment?: ExtHostStatusBarAlignment, priority?: number): StatusBarItem {
+		return new ExtHostStatusBarEntry(this._proxy, extensionId, alignment, priority);
 	}
 
 	setStatusBarMessage(text: string, timeoutOrThenable?: number | Thenable<any>): Disposable {

src/vs/workbench/api/common/extHostTypeConverters.ts

@@ -808,8 +808,7 @@ export namespace DocumentLink {
 	export function from(link: vscode.DocumentLink): modes.ILink {
 		return {
 			range: Range.from(link.range),
-			url: link.target,
-			tooltip: link.tooltip
+			url: link.target
 		};
 	}
 
@@ -859,7 +858,10 @@ export namespace Color {
 
 export namespace SelectionRange {
 	export function from(obj: vscode.SelectionRange): modes.SelectionRange {
-		return { range: Range.from(obj.range) };
+		return {
+			kind: '',
+			range: Range.from(obj.range)
+		};
 	}
 
 	export function to(obj: modes.SelectionRange): vscode.SelectionRange {

src/vs/workbench/api/common/extHostTypes.ts

@@ -1440,8 +1440,6 @@ export class DocumentLink {
 
 	target?: URI;
 
-	tooltip?: string;
-
 	constructor(range: Range, target: URI | undefined) {
 		if (target && !(target instanceof URI)) {
 			throw illegalArgument('target');

src/vs/workbench/api/common/extHostWebview.ts

@@ -8,7 +8,7 @@ import { URI } from 'vs/base/common/uri';
 import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
 import { EditorViewColumn } from 'vs/workbench/api/common/shared/editor';
 import * as vscode from 'vscode';
-import { ExtHostWebviewsShape, IMainContext, MainContext, MainThreadWebviewsShape, WebviewPanelHandle, WebviewPanelViewState } from './extHost.protocol';
+import { ExtHostWebviewsShape, IMainContext, MainContext, MainThreadWebviewsShape, WebviewPanelHandle, WebviewPanelViewState, WebviewInsetHandle } from './extHost.protocol';
 import { Disposable } from './extHostTypes';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import * as modes from 'vs/editor/common/modes';
@@ -16,7 +16,7 @@ import * as modes from 'vs/editor/common/modes';
 type IconPath = URI | { light: URI, dark: URI };
 
 export class ExtHostWebview implements vscode.Webview {
-	private readonly _handle: WebviewPanelHandle;
+	private readonly _handle: WebviewPanelHandle | WebviewInsetHandle;
 	private readonly _proxy: MainThreadWebviewsShape;
 	private _html: string;
 	private _options: vscode.WebviewOptions;
@@ -26,7 +26,7 @@ export class ExtHostWebview implements vscode.Webview {
 	public readonly onDidReceiveMessage: Event<any> = this._onMessageEmitter.event;
 
 	constructor(
-		handle: WebviewPanelHandle,
+		handle: WebviewPanelHandle | WebviewInsetHandle,
 		proxy: MainThreadWebviewsShape,
 		options: vscode.WebviewOptions
 	) {

src/vs/workbench/api/common/menusExtensionPoint.ts

@@ -21,6 +21,7 @@ namespace schema {
 	export interface IUserFriendlyMenuItem {
 		command: string;
 		alt?: string;
+		precondition?: string;
 		when?: string;
 		group?: string;
 	}
@@ -83,6 +84,10 @@ namespace schema {
 				collector.error(localize('optstring', "property `{0}` can be omitted or must be of type `string`", 'alt'));
 				return false;
 			}
+			if (item.precondition && typeof item.precondition !== 'string') {
+				collector.error(localize('optstring', "property `{0}` can be omitted or must be of type `string`", 'precondition'));
+				return false;
+			}
 			if (item.when && typeof item.when !== 'string') {
 				collector.error(localize('optstring', "property `{0}` can be omitted or must be of type `string`", 'when'));
 				return false;
@@ -107,6 +112,10 @@ namespace schema {
 				description: localize('vscode.extension.contributes.menuItem.alt', 'Identifier of an alternative command to execute. The command must be declared in the \'commands\'-section'),
 				type: 'string'
 			},
+			precondition: {
+				description: localize('vscode.extension.contributes.menuItem.precondition', 'Condition which must be true to enable this item'),
+				type: 'string'
+			},
 			when: {
 				description: localize('vscode.extension.contributes.menuItem.when', 'Condition which must be true to show this item'),
 				type: 'string'
@@ -197,8 +206,8 @@ namespace schema {
 				type: 'array',
 				items: menuItem
 			},
-			'comments/commentThread/context': {
-				description: localize('commentThread.actions', "The contributed comment thread context menu, rendered as buttons below the comment editor"),
+			'comments/commentThread/actions': {
+				description: localize('commentThread.actions', "The contributed comment thread actions"),
 				type: 'array',
 				items: menuItem
 			},
@@ -207,8 +216,8 @@ namespace schema {
 				type: 'array',
 				items: menuItem
 			},
-			'comments/comment/context': {
-				description: localize('comment.actions', "The contributed comment context menu, rendered as buttons below the comment editor"),
+			'comments/comment/actions': {
+				description: localize('comment.actions', "The contributed comment actions"),
 				type: 'array',
 				items: menuItem
 			},
@@ -220,7 +229,6 @@ namespace schema {
 	export interface IUserFriendlyCommand {
 		command: string;
 		title: string | ILocalizedString;
-		enablement?: string;
 		category?: string | ILocalizedString;
 		icon?: IUserFriendlyIcon;
 	}
@@ -239,10 +247,6 @@ namespace schema {
 		if (!isValidLocalizedString(command.title, collector, 'title')) {
 			return false;
 		}
-		if (command.enablement && typeof command.enablement !== 'string') {
-			collector.error(localize('optstring', "property `{0}` can be omitted or must be of type `string`", 'precondition'));
-			return false;
-		}
 		if (command.category && !isValidLocalizedString(command.category, collector, 'category')) {
 			return false;
 		}
@@ -296,10 +300,6 @@ namespace schema {
 				description: localize('vscode.extension.contributes.commandType.category', '(Optional) Category string by the command is grouped in the UI'),
 				type: 'string'
 			},
-			enablement: {
-				description: localize('vscode.extension.contributes.commandType.precondition', '(Optional) Condition which must be true to enable the command'),
-				type: 'string'
-			},
 			icon: {
 				description: localize('vscode.extension.contributes.commandType.icon', '(Optional) Icon which is used to represent the command in the UI. Either a file path or a themable configuration'),
 				anyOf: [{
@@ -336,12 +336,10 @@ namespace schema {
 
 let _commandRegistrations: IDisposable[] = [];
 
-export const commandsExtensionPoint = ExtensionsRegistry.registerExtensionPoint<schema.IUserFriendlyCommand | schema.IUserFriendlyCommand[]>({
+ExtensionsRegistry.registerExtensionPoint<schema.IUserFriendlyCommand | schema.IUserFriendlyCommand[]>({
 	extensionPoint: 'commands',
 	jsonSchema: schema.commandsContribution
-});
-
-commandsExtensionPoint.setHandler(extensions => {
+}).setHandler(extensions => {
 
 	function handleCommand(userFriendlyCommand: schema.IUserFriendlyCommand, extension: IExtensionPointUser<any>, disposables: IDisposable[]) {
 
@@ -349,7 +347,7 @@ commandsExtensionPoint.setHandler(extensions => {
 			return;
 		}
 
-		const { icon, enablement, category, title, command } = userFriendlyCommand;
+		const { icon, category, title, command } = userFriendlyCommand;
 
 		let absoluteIcon: { dark: URI; light?: URI; } | undefined;
 		if (icon) {
@@ -366,13 +364,7 @@ commandsExtensionPoint.setHandler(extensions => {
 		if (MenuRegistry.getCommand(command)) {
 			extension.collector.info(localize('dup', "Command `{0}` appears multiple times in the `commands` section.", userFriendlyCommand.command));
 		}
-		const registration = MenuRegistry.addCommand({
-			id: command,
-			title,
-			category,
-			precondition: ContextKeyExpr.deserialize(enablement),
-			iconLocation: absoluteIcon
-		});
+		const registration = MenuRegistry.addCommand({ id: command, title, category, iconLocation: absoluteIcon });
 		disposables.push(registration);
 	}
 
@@ -447,6 +439,14 @@ ExtensionsRegistry.registerExtensionPoint<{ [loc: string]: schema.IUserFriendlyM
 					}
 				}
 
+				if (item.precondition) {
+					command.precondition = ContextKeyExpr.deserialize(item.precondition);
+				}
+
+				if (alt && item.precondition) {
+					alt.precondition = command.precondition;
+				}
+
 				const registration = MenuRegistry.appendMenuItem(menu, {
 					command,
 					alt,

src/vs/workbench/api/electron-browser/extensionHost.contribution.ts

@@ -14,47 +14,47 @@ import { ColorExtensionPoint } from 'vs/workbench/services/themes/common/colorEx
 import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint';
 
 // --- mainThread participants
-import './mainThreadCodeInsets';
-import './mainThreadClipboard';
-import './mainThreadCommands';
-import './mainThreadConfiguration';
-import './mainThreadConsole';
-// import './mainThreadDebugService'; {{SQL CARBON EDIT}} @anthonydresser comment out debug service
-import './mainThreadDecorations';
-import './mainThreadDiagnostics';
-import './mainThreadDialogs';
-import './mainThreadDocumentContentProviders';
-import './mainThreadDocuments';
-import './mainThreadDocumentsAndEditors';
-import './mainThreadEditor';
-import './mainThreadEditors';
-import './mainThreadErrors';
-import './mainThreadExtensionService';
-import './mainThreadFileSystem';
-import './mainThreadFileSystemEventService';
-import './mainThreadHeapService';
-import './mainThreadKeytar';
-import './mainThreadLanguageFeatures';
-import './mainThreadLanguages';
-import './mainThreadLogService';
-import './mainThreadMessageService';
-import './mainThreadOutputService';
-import './mainThreadProgress';
-import './mainThreadQuickOpen';
-import './mainThreadSaveParticipant';
-import './mainThreadSCM';
-import './mainThreadSearch';
-import './mainThreadStatusBar';
-import './mainThreadStorage';
-import './mainThreadTelemetry';
-import './mainThreadTerminalService';
-import './mainThreadTreeViews';
-import './mainThreadUrls';
-import './mainThreadWindow';
+import '../browser/mainThreadClipboard';
+import '../browser/mainThreadCommands';
+import '../browser/mainThreadConfiguration';
+import '../browser/mainThreadConsole';
+// {{SQL CARBON EDIT}}
+// import '../browser/mainThreadDebugService';
+import '../browser/mainThreadDecorations';
+import '../browser/mainThreadDiagnostics';
+import '../browser/mainThreadDialogs';
+import '../browser/mainThreadDocumentContentProviders';
+import '../browser/mainThreadDocuments';
+import '../browser/mainThreadDocumentsAndEditors';
+import '../browser/mainThreadEditor';
+import '../browser/mainThreadEditors';
+import '../browser/mainThreadErrors';
+import '../browser/mainThreadExtensionService';
+import '../browser/mainThreadFileSystem';
+import '../browser/mainThreadFileSystemEventService';
+import '../browser/mainThreadHeapService';
+import '../browser/mainThreadKeytar';
+import '../browser/mainThreadLanguageFeatures';
+import '../browser/mainThreadLanguages';
+import '../browser/mainThreadLogService';
+import '../browser/mainThreadMessageService';
+import '../browser/mainThreadOutputService';
+import '../browser/mainThreadProgress';
+import '../browser/mainThreadQuickOpen';
+import '../browser/mainThreadSaveParticipant';
+import '../browser/mainThreadSCM';
+import '../browser/mainThreadSearch';
+import '../browser/mainThreadStatusBar';
+import '../browser/mainThreadStorage';
+import '../browser/mainThreadTelemetry';
+import '../browser/mainThreadTerminalService';
+import '../browser/mainThreadTreeViews';
+import '../browser/mainThreadUrls';
+import '../browser/mainThreadWindow';
+import '../browser/mainThreadWorkspace';
+import '../browser/mainThreadComments';
+import '../browser/mainThreadTask';
 import './mainThreadWebview';
-import './mainThreadWorkspace';
-import './mainThreadComments';
-import './mainThreadTask';
 import 'vs/workbench/api/common/apiCommands';
 
 export class ExtensionPoints implements IWorkbenchContribution {

src/vs/workbench/api/electron-browser/mainThreadWebview.ts

@@ -2,27 +2,30 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import * as map from 'vs/base/common/map';
 import { URI, UriComponents } from 'vs/base/common/uri';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import * as modes from 'vs/editor/common/modes';
 import { localize } from 'vs/nls';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
+import product from 'vs/platform/product/node/product';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, MainThreadWebviewsShape, WebviewPanelHandle, WebviewPanelShowOptions } from 'vs/workbench/api/common/extHost.protocol';
+import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, MainThreadWebviewsShape, WebviewInsetHandle, WebviewPanelHandle, WebviewPanelShowOptions } from 'vs/workbench/api/common/extHost.protocol';
 import { editorGroupToViewColumn, EditorViewColumn, viewColumnToEditorGroup } from 'vs/workbench/api/common/shared/editor';
+import { CodeInsetController } from 'vs/workbench/contrib/codeinset/electron-browser/codeInset.contribution';
 import { WebviewEditor } from 'vs/workbench/contrib/webview/browser/webviewEditor';
 import { WebviewEditorInput } from 'vs/workbench/contrib/webview/browser/webviewEditorInput';
 import { ICreateWebViewShowOptions, IWebviewEditorService, WebviewInputOptions } from 'vs/workbench/contrib/webview/browser/webviewEditorService';
+import { WebviewElement } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { ACTIVE_GROUP, IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { extHostNamedCustomer } from '../common/extHostCustomers';
-import { IProductService } from 'vs/platform/product/common/product';
 
 @extHostNamedCustomer(MainContext.MainThreadWebviews)
 export class MainThreadWebviews extends Disposable implements MainThreadWebviewsShape {
@@ -31,8 +34,9 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		'http',
 		'https',
 		'mailto',
+		product.urlProtocol,
 		'vscode',
-		'vscode-insider',
+		'vscode-insiders'
 	]);
 
 	private static revivalPool = 0;
@@ -40,6 +44,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 
 	private readonly _proxy: ExtHostWebviewsShape;
 	private readonly _webviews = new Map<WebviewPanelHandle, WebviewEditorInput>();
+	private readonly _webviewsElements = new Map<WebviewInsetHandle, WebviewElement>();
 	private readonly _revivers = new Map<string, IDisposable>();
 
 	private _activeWebview: WebviewPanelHandle | undefined = undefined;
@@ -53,17 +58,18 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		@IWebviewEditorService private readonly _webviewService: IWebviewEditorService,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@IProductService private readonly _productService: IProductService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
 	) {
 		super();
 
 		this._proxy = context.getProxy(ExtHostContext.ExtHostWebviews);
-		this._register(_editorService.onDidActiveEditorChange(this.onActiveEditorChanged, this));
-		this._register(_editorService.onDidVisibleEditorsChange(this.onVisibleEditorsChanged, this));
+		_editorService.onDidActiveEditorChange(this.onActiveEditorChanged, this, this._toDispose);
+		_editorService.onDidVisibleEditorsChange(this.onVisibleEditorsChanged, this, this._toDispose);
 
 		// This reviver's only job is to activate webview extensions
 		// This should trigger the real reviver to be registered from the extension host side.
-		this._register(_webviewService.registerReviver({
+		this._toDispose.push(_webviewService.registerReviver({
 			canRevive: (webview) => {
 				const viewType = webview.state.viewType;
 				if (viewType) {
@@ -74,9 +80,9 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 			reviveWebview: () => { throw new Error('not implemented'); }
 		}));
 
-		this._register(lifecycleService.onBeforeShutdown(e => {
+		lifecycleService.onBeforeShutdown(e => {
 			e.veto(this._onBeforeShutdown());
-		}, this));
+		}, this, this._toDispose);
 	}
 
 	public $createWebviewPanel(
@@ -113,6 +119,52 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		this._telemetryService.publicLog('webviews:createWebviewPanel', { extensionId: extensionId.value });
 	}
 
+	$createWebviewCodeInset(
+		handle: WebviewInsetHandle,
+		symbolId: string,
+		options: modes.IWebviewOptions,
+		extensionId: ExtensionIdentifier,
+		extensionLocation: UriComponents
+	): void {
+		// todo@joh main is for the lack of a code-inset service
+		// which we maybe wanna have... this is how it now works
+		// 1) create webview element
+		// 2) find the code inset controller that request it
+		// 3) let the controller adopt the widget
+		// 4) continue to forward messages to the webview
+		const webview = this._instantiationService.createInstance(
+			WebviewElement,
+			{
+				extension: {
+					location: URI.revive(extensionLocation),
+					id: extensionId
+				},
+				enableFindWidget: false,
+			},
+			{
+				allowScripts: options.enableScripts,
+			}
+		);
+
+		let found = false;
+		for (const editor of this._codeEditorService.listCodeEditors()) {
+			const ctrl = CodeInsetController.get(editor);
+			if (ctrl && ctrl.acceptWebview(symbolId, webview)) {
+				found = true;
+				break;
+			}
+		}
+
+		if (!found) {
+			webview.dispose();
+			return;
+		}
+		// this will leak... the adopted webview will be disposed by the
+		// code inset controller. we might need a dispose-event here so that
+		// we can clean up things.
+		this._webviewsElements.set(handle, webview);
+	}
+
 	public $disposeWebview(handle: WebviewPanelHandle): void {
 		const webview = this.getWebview(handle);
 		webview.dispose();
@@ -128,14 +180,22 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		webview.iconPath = reviveWebviewIcon(value);
 	}
 
-	public $setHtml(handle: WebviewPanelHandle, value: string): void {
-		const webview = this.getWebview(handle);
-		webview.html = value;
+	public $setHtml(handle: WebviewPanelHandle | WebviewInsetHandle, value: string): void {
+		if (typeof handle === 'number') {
+			this.getWebviewElement(handle).html = value;
+		} else {
+			const webview = this.getWebview(handle);
+			webview.html = value;
+		}
 	}
 
-	public $setOptions(handle: WebviewPanelHandle, options: modes.IWebviewOptions): void {
-		const webview = this.getWebview(handle);
-		webview.setOptions(reviveWebviewOptions(options as any /*todo@mat */));
+	public $setOptions(handle: WebviewPanelHandle | WebviewInsetHandle, options: modes.IWebviewOptions): void {
+		if (typeof handle === 'number') {
+			this.getWebviewElement(handle).options = reviveWebviewOptions(options as any /*todo@mat */);
+		} else {
+			const webview = this.getWebview(handle);
+			webview.setOptions(reviveWebviewOptions(options as any /*todo@mat */));
+		}
 	}
 
 	public $reveal(handle: WebviewPanelHandle, showOptions: WebviewPanelShowOptions): void {
@@ -150,24 +210,29 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		}
 	}
 
-	public async $postMessage(handle: WebviewPanelHandle, message: any): Promise<boolean> {
-		const webview = this.getWebview(handle);
-		const editors = this._editorService.visibleControls
-			.filter(e => e instanceof WebviewEditor)
-			.map(e => e as WebviewEditor)
-			.filter(e => e.input!.matches(webview));
-
-		if (editors.length > 0) {
-			editors[0].sendMessage(message);
+	public async $postMessage(handle: WebviewPanelHandle | WebviewInsetHandle, message: any): Promise<boolean> {
+		if (typeof handle === 'number') {
+			this.getWebviewElement(handle).sendMessage(message);
 			return true;
-		}
+		} else {
+			const webview = this.getWebview(handle);
+			const editors = this._editorService.visibleControls
+				.filter(e => e instanceof WebviewEditor)
+				.map(e => e as WebviewEditor)
+				.filter(e => e.input!.matches(webview));
 
-		if (webview.webview) {
-			webview.webview.sendMessage(message);
-			return true;
-		}
+			if (editors.length > 0) {
+				editors[0].sendMessage(message);
+				return true;
+			}
 
-		return false;
+			if (webview.webview) {
+				webview.webview.sendMessage(message);
+				return true;
+			}
+
+			return false;
+		}
 	}
 
 	public $registerSerializer(viewType: string): void {
@@ -319,9 +384,6 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		if (MainThreadWebviews.standardSupportedLinkSchemes.has(link.scheme)) {
 			return true;
 		}
-		if (this._productService.urlProtocol === link.scheme) {
-			return true;
-		}
 		return !!webview.options.enableCommandUris && link.scheme === 'command';
 	}
 
@@ -333,6 +395,14 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		return webview;
 	}
 
+	private getWebviewElement(handle: number): WebviewElement {
+		const webview = this._webviewsElements.get(handle);
+		if (!webview) {
+			throw new Error('Unknown webview handle:' + handle);
+		}
+		return webview;
+	}
+
 	private static getDeserializationFailedContents(viewType: string) {
 		return `<!DOCTYPE html>
 		<html>

src/vs/workbench/api/node/extHost.api.impl.ts

@@ -3,7 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import * as errors from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -37,7 +36,7 @@ import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionS
 import { ExtHostFileSystem } from 'vs/workbench/api/common/extHostFileSystem';
 import { ExtHostFileSystemEventService } from 'vs/workbench/api/common/extHostFileSystemEventService';
 import { ExtHostHeapService } from 'vs/workbench/api/common/extHostHeapService';
-import { ExtHostLanguageFeatures } from 'vs/workbench/api/common/extHostLanguageFeatures';
+import { ExtHostLanguageFeatures, ISchemeTransformer } from 'vs/workbench/api/common/extHostLanguageFeatures';
 import { ExtHostLanguages } from 'vs/workbench/api/common/extHostLanguages';
 import { ExtHostLogService } from 'vs/workbench/api/common/extHostLogService';
 import { ExtHostMessageService } from 'vs/workbench/api/common/extHostMessageService';
@@ -69,8 +68,6 @@ import { CLIServer } from 'vs/workbench/api/node/extHostCLIServer';
 import { withNullAsUndefined } from 'vs/base/common/types';
 import { values } from 'vs/base/common/collections';
 import { Schemas } from 'vs/base/common/network';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { ExtHostEditorInsets } from 'vs/workbench/api/common/extHostCodeInsets';
 
 export interface IExtensionApiFactory {
 	(extension: IExtensionDescription, registry: ExtensionDescriptionRegistry, configProvider: ExtHostConfigProvider): typeof vscode;
@@ -95,7 +92,8 @@ export function createApiFactory(
 	extensionService: ExtHostExtensionService,
 	extHostLogService: ExtHostLogService,
 	extHostStorage: ExtHostStorage,
-	uriTransformer: IURITransformer | null
+	schemeTransformer: ISchemeTransformer | null,
+	outputChannelName: string
 ): IExtensionApiFactory {
 
 	// Addressable instances
@@ -113,9 +111,8 @@ export function createApiFactory(
 	const extHostTreeViews = rpcProtocol.set(ExtHostContext.ExtHostTreeViews, new ExtHostTreeViews(rpcProtocol.getProxy(MainContext.MainThreadTreeViews), extHostCommands, extHostLogService));
 	rpcProtocol.set(ExtHostContext.ExtHostWorkspace, extHostWorkspace);
 	rpcProtocol.set(ExtHostContext.ExtHostConfiguration, extHostConfiguration);
-	const extHostEditorInsets = rpcProtocol.set(ExtHostContext.ExtHostEditorInsets, new ExtHostEditorInsets(rpcProtocol.getProxy(MainContext.MainThreadEditorInsets), extHostEditors));
 	const extHostDiagnostics = rpcProtocol.set(ExtHostContext.ExtHostDiagnostics, new ExtHostDiagnostics(rpcProtocol));
-	const extHostLanguageFeatures = rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, new ExtHostLanguageFeatures(rpcProtocol, uriTransformer, extHostDocuments, extHostCommands, extHostHeapService, extHostDiagnostics, extHostLogService));
+	const extHostLanguageFeatures = rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, new ExtHostLanguageFeatures(rpcProtocol, schemeTransformer, extHostDocuments, extHostCommands, extHostHeapService, extHostDiagnostics, extHostLogService));
 	const extHostFileSystem = rpcProtocol.set(ExtHostContext.ExtHostFileSystem, new ExtHostFileSystem(rpcProtocol, extHostLanguageFeatures));
 	const extHostFileSystemEvent = rpcProtocol.set(ExtHostContext.ExtHostFileSystemEventService, new ExtHostFileSystemEventService(rpcProtocol, extHostDocumentsAndEditors));
 	const extHostQuickOpen = rpcProtocol.set(ExtHostContext.ExtHostQuickOpen, new ExtHostQuickOpen(rpcProtocol, extHostWorkspace, extHostCommands));
@@ -124,7 +121,7 @@ export function createApiFactory(
 	// const extHostDebugService = rpcProtocol.set(ExtHostContext.ExtHostDebugService, new ExtHostDebugService(rpcProtocol, extHostWorkspace, extensionService, extHostDocumentsAndEditors, extHostConfiguration, extHostTerminalService, extHostCommands));
 	const extHostSCM = rpcProtocol.set(ExtHostContext.ExtHostSCM, new ExtHostSCM(rpcProtocol, extHostCommands, extHostLogService));
 	const extHostComment = rpcProtocol.set(ExtHostContext.ExtHostComments, new ExtHostComments(rpcProtocol, extHostCommands, extHostDocuments));
-	const extHostSearch = rpcProtocol.set(ExtHostContext.ExtHostSearch, new ExtHostSearch(rpcProtocol, uriTransformer, extHostLogService));
+	const extHostSearch = rpcProtocol.set(ExtHostContext.ExtHostSearch, new ExtHostSearch(rpcProtocol, schemeTransformer, extHostLogService));
 	const extHostTask = rpcProtocol.set(ExtHostContext.ExtHostTask, new ExtHostTask(rpcProtocol, extHostWorkspace, extHostDocumentsAndEditors, extHostConfiguration, extHostTerminalService));
 	const extHostWindow = rpcProtocol.set(ExtHostContext.ExtHostWindow, new ExtHostWindow(rpcProtocol));
 	rpcProtocol.set(ExtHostContext.ExtHostExtensionService, extensionService);
@@ -157,7 +154,6 @@ export function createApiFactory(
 	const extHostLanguages = new ExtHostLanguages(rpcProtocol, extHostDocuments);
 
 	// Register an output channel for exthost log
-	const outputChannelName = initData.remoteAuthority ? nls.localize('remote extension host Log', "Remote Extension Host") : nls.localize('extension host Log', "Extension Host");
 	extHostOutputService.createOutputChannelFromLogFile(outputChannelName, extHostLogService.logFile);
 
 	// Register API-ish commands
@@ -167,7 +163,7 @@ export function createApiFactory(
 
 		// Check document selectors for being overly generic. Technically this isn't a problem but
 		// in practice many extensions say they support `fooLang` but need fs-access to do so. Those
-		// extension should specify then the `file`-scheme, e.g. `{ scheme: 'fooLang', language: 'fooLang' }`
+		// extension should specify then the `file`-scheme, e.g `{ scheme: 'fooLang', language: 'fooLang' }`
 		// We only inform once, it is not a warning because we just want to raise awareness and because
 		// we cannot say if the extension is doing it right or wrong...
 		const checkSelector = (function () {
@@ -243,7 +239,7 @@ export function createApiFactory(
 		};
 
 		// namespace: env
-		const env: typeof vscode.env = {
+		const env: typeof vscode.env = Object.freeze({
 			get machineId() { return initData.telemetryInfo.machineId; },
 			get sessionId() { return initData.telemetryInfo.sessionId; },
 			get language() { return initData.environment.appLanguage; },
@@ -264,11 +260,7 @@ export function createApiFactory(
 			openExternal(uri: URI) {
 				return extHostWindow.openUri(uri, { allowTunneling: !!initData.remoteAuthority });
 			}
-		};
-		if (!initData.environment.extensionTestsLocationURI) {
-			// allow to patch env-function when running tests
-			Object.freeze(env);
-		}
+		});
 
 		// namespace: extensions
 		const extensions: typeof vscode.extensions = {
@@ -313,6 +305,10 @@ export function createApiFactory(
 			registerCodeLensProvider(selector: vscode.DocumentSelector, provider: vscode.CodeLensProvider): vscode.Disposable {
 				return extHostLanguageFeatures.registerCodeLensProvider(extension, checkSelector(selector), provider);
 			},
+			registerCodeInsetProvider(selector: vscode.DocumentSelector, provider: vscode.CodeInsetProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension);
+				return extHostLanguageFeatures.registerCodeInsetProvider(extension, checkSelector(selector), provider);
+			},
 			registerDefinitionProvider(selector: vscode.DocumentSelector, provider: vscode.DefinitionProvider): vscode.Disposable {
 				return extHostLanguageFeatures.registerDefinitionProvider(extension, checkSelector(selector), provider);
 			},
@@ -474,10 +470,7 @@ export function createApiFactory(
 				return extHostDialogs.showSaveDialog(options);
 			},
 			createStatusBarItem(position?: vscode.StatusBarAlignment, priority?: number): vscode.StatusBarItem {
-				const id = extension.identifier.value;
-				const name = nls.localize('extensionLabel', "{0} (Extension)", extension.displayName || extension.name);
-
-				return extHostStatusBar.createStatusBarEntry(id, name, <number>position, priority);
+				return extHostStatusBar.createStatusBarEntry(extension.identifier, <number>position, priority);
 			},
 			setStatusBarMessage(text: string, timeoutOrThenable?: number | Thenable<any>): vscode.Disposable {
 				return extHostStatusBar.setStatusBarMessage(text, timeoutOrThenable);
@@ -495,14 +488,9 @@ export function createApiFactory(
 			createWebviewPanel(viewType: string, title: string, showOptions: vscode.ViewColumn | { viewColumn: vscode.ViewColumn, preserveFocus?: boolean }, options: vscode.WebviewPanelOptions & vscode.WebviewOptions): vscode.WebviewPanel {
 				return extHostWebviews.createWebviewPanel(extension, viewType, title, showOptions, options);
 			},
-			createWebviewTextEditorInset(editor: vscode.TextEditor, range: vscode.Range, options: vscode.WebviewOptions): vscode.WebviewEditorInset {
-				checkProposedApiEnabled(extension);
-				return extHostEditorInsets.createWebviewEditorInset(editor, range, options);
-			},
 			createTerminal(nameOrOptions?: vscode.TerminalOptions | string, shellPath?: string, shellArgs?: string[] | string): vscode.Terminal {
 				if (typeof nameOrOptions === 'object') {
-					nameOrOptions.runInBackground = nameOrOptions.runInBackground && extension.enableProposedApi;
-					return extHostTerminalService.createTerminalFromOptions(nameOrOptions);
+					return extHostTerminalService.createTerminalFromOptions(<vscode.TerminalOptions>nameOrOptions);
 				}
 				return extHostTerminalService.createTerminal(<string>nameOrOptions, shellPath, shellArgs);
 			},

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

@@ -33,10 +33,10 @@ import { IWorkspace } from 'vs/platform/workspace/common/workspace';
 import { Schemas } from 'vs/base/common/network';
 import { withNullAsUndefined } from 'vs/base/common/types';
 import { VSBuffer } from 'vs/base/common/buffer';
+import { ISchemeTransformer } from 'vs/workbench/api/common/extHostLanguageFeatures';
 import { ExtensionMemento } from 'vs/workbench/api/common/extHostMemento';
 import { ExtensionStoragePaths } from 'vs/workbench/api/node/extHostStoragePaths';
 import { RemoteAuthorityResolverError, ExtensionExecutionContext } from 'vs/workbench/api/common/extHostTypes';
-import { IURITransformer } from 'vs/base/common/uriIpc';
 
 interface ITestRunner {
 	run(testsRoot: string, clb: (error: Error, failures?: number) => void): void;
@@ -86,7 +86,8 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		extHostConfiguration: ExtHostConfiguration,
 		environment: IEnvironment,
 		extHostLogService: ExtHostLogService,
-		uriTransformer: IURITransformer | null
+		schemeTransformer: ISchemeTransformer | null,
+		outputChannelName: string
 	) {
 		this._hostUtils = hostUtils;
 		this._initData = initData;
@@ -136,7 +137,8 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 			this,
 			this._extHostLogService,
 			this._storage,
-			uriTransformer
+			schemeTransformer,
+			outputChannelName
 		);
 
 		this._resolvers = Object.create(null);

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

@@ -51,7 +51,7 @@ export const LogOutputChannelFactory = new class implements IOutputChannelFactor
 		try {
 			const outputDirPath = join(logsLocation.fsPath, `output_logging_${toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')}`);
 			const outputDir = await dirExists(outputDirPath).then(exists => exists ? exists : mkdirp(outputDirPath).then(() => true)).then(() => outputDirPath);
-			const fileName = `${this._namePool++}-${name.replace(/[\\/:\*\?"<>\|]/g, '')}`;
+			const fileName = `${this._namePool++}-${name}`;
 			const file = URI.file(join(outputDir, `${fileName}.log`));
 			const appender = new OutputAppender(fileName, file.fsPath);
 			return new ExtHostOutputChannelBackedByFile(name, appender, proxy);

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

@@ -16,7 +16,10 @@ import { OutputChannel } from 'vs/workbench/services/search/node/ripgrepSearchUt
 import { TextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
 import * as vscode from 'vscode';
 import { ExtHostSearchShape, IMainContext, MainContext, MainThreadSearchShape } from '../common/extHost.protocol';
-import { IURITransformer } from 'vs/base/common/uriIpc';
+
+export interface ISchemeTransformer {
+	transformOutgoing(scheme: string): string;
+}
 
 export class ExtHostSearch implements ExtHostSearchShape {
 
@@ -32,14 +35,14 @@ export class ExtHostSearch implements ExtHostSearchShape {
 
 	private _fileSearchManager: FileSearchManager;
 
-	constructor(mainContext: IMainContext, private _uriTransformer: IURITransformer | null, private _logService: ILogService, private _pfs = pfs) {
+	constructor(mainContext: IMainContext, private _schemeTransformer: ISchemeTransformer | null, private _logService: ILogService, private _pfs = pfs) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadSearch);
 		this._fileSearchManager = new FileSearchManager();
 	}
 
 	private _transformScheme(scheme: string): string {
-		if (this._uriTransformer) {
-			return this._uriTransformer.transformOutgoingScheme(scheme);
+		if (this._schemeTransformer) {
+			return this._schemeTransformer.transformOutgoing(scheme);
 		}
 		return scheme;
 	}

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

@@ -714,7 +714,7 @@ export class ExtHostTask implements ExtHostTaskShape {
 					paths[i] = resolver.resolve(ws, paths[i]);
 				}
 			}
-			result.process = await win32.findExecutable(
+			result.process = win32.findExecutable(
 				resolver.resolve(ws, toResolve.process.name),
 				toResolve.process.cwd !== undefined ? resolver.resolve(ws, toResolve.process.cwd) : undefined,
 				paths

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

@@ -115,10 +115,9 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 		cwd?: string | URI,
 		env?: { [key: string]: string | null },
 		waitOnExit?: boolean,
-		strictEnv?: boolean,
-		runInBackground?: boolean
+		strictEnv?: boolean
 	): void {
-		this._proxy.$createTerminal(this._name, shellPath, shellArgs, cwd, env, waitOnExit, strictEnv, runInBackground).then(terminal => {
+		this._proxy.$createTerminal(this._name, shellPath, shellArgs, cwd, env, waitOnExit, strictEnv).then(terminal => {
 			this._name = terminal.name;
 			this._runQueuedRequests(terminal.id);
 		});
@@ -177,7 +176,7 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 			this._pidPromiseComplete(processId);
 			this._pidPromiseComplete = null;
 		} else {
-			// Recreate the promise if this is the nth processId set (e.g. reused task terminals)
+			// Recreate the promise if this is the nth processId set (eg. reused task terminals)
 			this._pidPromise.then(pid => {
 				if (pid !== processId) {
 					this._pidPromise = Promise.resolve(processId);
@@ -310,7 +309,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 
 	public createTerminalFromOptions(options: vscode.TerminalOptions): vscode.Terminal {
 		const terminal = new ExtHostTerminal(this._proxy, options.name);
-		terminal.create(options.shellPath, options.shellArgs, options.cwd, options.env, /*options.waitOnExit*/ undefined, options.strictEnv, options.runInBackground);
+		terminal.create(options.shellPath, options.shellArgs, options.cwd, options.env, /*options.waitOnExit*/ undefined, options.strictEnv);
 		this._terminals.push(terminal);
 		return terminal;
 	}

src/vs/workbench/browser/actions.ts

@@ -24,7 +24,7 @@ export class ActionBarContributor {
 	/**
 	 * Returns an array of primary actions in the given context.
 	 */
-	getActions(context: unknown): ReadonlyArray<IAction> {
+	getActions(context: unknown): IAction[] {
 		return [];
 	}
 }
@@ -66,7 +66,7 @@ export class ContributableActionProvider implements IActionProvider {
 		return false;
 	}
 
-	getActions(tree: ITree, element: unknown): ReadonlyArray<IAction> {
+	getActions(tree: ITree, element: unknown): IAction[] {
 		const actions: IAction[] = [];
 		const context = this.toContext(tree, element);
 
@@ -155,7 +155,7 @@ export interface IActionBarRegistry {
 
 class ActionBarRegistry implements IActionBarRegistry {
 	private readonly actionBarContributorConstructors: { scope: string; ctor: IConstructorSignature0<ActionBarContributor>; }[] = [];
-	private readonly actionBarContributorInstances: Map<string, ActionBarContributor[]> = new Map();
+	private readonly actionBarContributorInstances: { [scope: string]: ActionBarContributor[] } = Object.create(null);
 	private instantiationService: IInstantiationService;
 
 	start(accessor: ServicesAccessor): void {
@@ -169,16 +169,15 @@ class ActionBarRegistry implements IActionBarRegistry {
 
 	private createActionBarContributor(scope: string, ctor: IConstructorSignature0<ActionBarContributor>): void {
 		const instance = this.instantiationService.createInstance(ctor);
-		let target = this.actionBarContributorInstances.get(scope);
+		let target = this.actionBarContributorInstances[scope];
 		if (!target) {
-			target = [];
-			this.actionBarContributorInstances.set(scope, target);
+			target = this.actionBarContributorInstances[scope] = [];
 		}
 		target.push(instance);
 	}
 
 	private getContributors(scope: string): ActionBarContributor[] {
-		return this.actionBarContributorInstances.get(scope) || [];
+		return this.actionBarContributorInstances[scope] || [];
 	}
 
 	registerActionBarContributor(scope: string, ctor: IConstructorSignature0<ActionBarContributor>): void {

src/vs/workbench/browser/actions/layoutActions.ts

@@ -21,9 +21,8 @@ import { MenuBarVisibility } from 'vs/platform/windows/common/windows';
 import { isWindows, isLinux } from 'vs/base/common/platform';
 import { IsMacContext } from 'vs/workbench/browser/contextkeys';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { InEditorZenModeContext, IsCenteredLayoutContext } from 'vs/workbench/common/editor';
+import { InEditorZenModeContext } from 'vs/workbench/common/editor';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { SideBarVisibleContext } from 'vs/workbench/common/viewlet';
 
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
 const viewCategory = nls.localize('view', "View");
@@ -62,8 +61,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	group: '2_workbench_layout',
 	command: {
 		id: ToggleActivityBarVisibilityAction.ID,
-		title: nls.localize({ key: 'miShowActivityBar', comment: ['&& denotes a mnemonic'] }, "Show &&Activity Bar"),
-		toggled: ContextKeyExpr.equals('config.workbench.activityBar.visible', true)
+		title: nls.localize({ key: 'miToggleActivityBar', comment: ['&& denotes a mnemonic'] }, "Toggle &&Activity Bar")
 	},
 	order: 4
 });
@@ -97,8 +95,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	group: '1_toggle_view',
 	command: {
 		id: ToggleCenteredLayout.ID,
-		title: nls.localize('miToggleCenteredLayout', "Centered Layout"),
-		toggled: IsCenteredLayoutContext
+		title: nls.localize('miToggleCenteredLayout', "Toggle Centered Layout")
 	},
 	order: 3
 });
@@ -206,22 +203,11 @@ export class ToggleSidebarPositionAction extends Action {
 registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleSidebarPositionAction, ToggleSidebarPositionAction.ID, ToggleSidebarPositionAction.LABEL), 'View: Toggle Side Bar Position', viewCategory);
 
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
-	group: '3_workbench_layout_move',
+	group: '2_workbench_layout',
 	command: {
 		id: ToggleSidebarPositionAction.ID,
-		title: nls.localize({ key: 'miMoveSidebarRight', comment: ['&& denotes a mnemonic'] }, "&&Move Side Bar Right")
+		title: nls.localize({ key: 'miMoveSidebarLeftRight', comment: ['&& denotes a mnemonic'] }, "&&Move Side Bar Left/Right")
 	},
-	when: ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'),
-	order: 2
-});
-
-MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
-	group: '3_workbench_layout_move',
-	command: {
-		id: ToggleSidebarPositionAction.ID,
-		title: nls.localize({ key: 'miMoveSidebarLeft', comment: ['&& denotes a mnemonic'] }, "&&Move Side Bar Left")
-	},
-	when: ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'),
 	order: 2
 });
 
@@ -280,15 +266,14 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	group: '2_workbench_layout',
 	command: {
 		id: ToggleSidebarVisibilityAction.ID,
-		title: nls.localize({ key: 'miShowSidebar', comment: ['&& denotes a mnemonic'] }, "Show &&Side Bar"),
-		toggled: SideBarVisibleContext
+		title: nls.localize({ key: 'miToggleSidebar', comment: ['&& denotes a mnemonic'] }, "&&Toggle Side Bar")
 	},
 	order: 1
 });
 
 // --- Toggle Statusbar Visibility
 
-export class ToggleStatusbarVisibilityAction extends Action {
+class ToggleStatusbarVisibilityAction extends Action {
 
 	static readonly ID = 'workbench.action.toggleStatusbarVisibility';
 	static readonly LABEL = nls.localize('toggleStatusbar', "Toggle Status Bar Visibility");
@@ -320,8 +305,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	group: '2_workbench_layout',
 	command: {
 		id: ToggleStatusbarVisibilityAction.ID,
-		title: nls.localize({ key: 'miShowStatusbar', comment: ['&& denotes a mnemonic'] }, "Show S&&tatus Bar"),
-		toggled: ContextKeyExpr.equals('config.workbench.statusBar.visible', true)
+		title: nls.localize({ key: 'miToggleStatusbar', comment: ['&& denotes a mnemonic'] }, "&&Toggle Status Bar")
 	},
 	order: 3
 });
@@ -386,8 +370,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	group: '1_toggle_view',
 	command: {
 		id: ToggleZenMode.ID,
-		title: nls.localize('miToggleZenMode', "Zen Mode"),
-		toggled: InEditorZenModeContext
+		title: nls.localize('miToggleZenMode', "Toggle Zen Mode")
 	},
 	order: 2
 });
@@ -444,13 +427,13 @@ if (isWindows || isLinux) {
 }
 
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
-	group: '2_workbench_layout',
+	group: '1_toggle_view',
 	command: {
 		id: ToggleMenuBarAction.ID,
-		title: nls.localize({ key: 'miShowMenuBar', comment: ['&& denotes a mnemonic'] }, "Show Menu &&Bar"),
-		toggled: ContextKeyExpr.and(IsMacContext.toNegated(), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'hidden'), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'toggle'))
+		title: nls.localize({ key: 'miToggleMenuBar', comment: ['&& denotes a mnemonic'] }, "Toggle Menu &&Bar")
 	},
-	order: 0
+	when: IsMacContext.toNegated(),
+	order: 4
 });
 
 // --- Resize View

src/vs/workbench/browser/composite.ts

@@ -150,7 +150,7 @@ export abstract class Composite extends Component implements IComposite {
 	/**
 	 * Returns an array of actions to show in the action bar of the composite.
 	 */
-	getActions(): ReadonlyArray<IAction> {
+	getActions(): IAction[] {
 		return [];
 	}
 
@@ -158,14 +158,14 @@ export abstract class Composite extends Component implements IComposite {
 	 * Returns an array of actions to show in the action bar of the composite
 	 * in a less prominent way then action from getActions.
 	 */
-	getSecondaryActions(): ReadonlyArray<IAction> {
+	getSecondaryActions(): IAction[] {
 		return [];
 	}
 
 	/**
 	 * Returns an array of actions to show in the context menu of the composite
 	 */
-	getContextMenuActions(): ReadonlyArray<IAction> {
+	getContextMenuActions(): IAction[] {
 		return [];
 	}
 

src/vs/workbench/browser/contextkeys.ts

@@ -8,7 +8,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { IContextKeyService, IContextKey, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { InputFocusedContext } from 'vs/platform/contextkey/common/contextkeys';
 import { IWindowsConfiguration } from 'vs/platform/windows/common/windows';
-import { ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, TEXT_DIFF_EDITOR_ID, SplitEditorsVertically, InEditorZenModeContext, IsCenteredLayoutContext } from 'vs/workbench/common/editor';
+import { ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, TEXT_DIFF_EDITOR_ID, SplitEditorsVertically, InEditorZenModeContext } from 'vs/workbench/common/editor';
 import { trackFocus, addDisposableListener, EventType } from 'vs/base/browser/dom';
 import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -16,10 +16,9 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { SideBarVisibleContext } from 'vs/workbench/common/viewlet';
-import { IWorkbenchLayoutService, Parts, Position } from 'vs/workbench/services/layout/browser/layoutService';
+import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { isMacintosh, isLinux, isWindows } from 'vs/base/common/platform';
-import { PanelPositionContext } from 'vs/workbench/common/panel';
 
 export const IsMacContext = new RawContextKey<boolean>('isMac', isMacintosh);
 export const IsLinuxContext = new RawContextKey<boolean>('isLinux', isLinux);
@@ -39,8 +38,6 @@ export const WorkspaceFolderCountContext = new RawContextKey<number>('workspaceF
 
 export const RemoteFileDialogContext = new RawContextKey<boolean>('remoteFileDialogVisible', false);
 
-export const IsFullscreenContext = new RawContextKey<boolean>('isFullscreen', false);
-
 export class WorkbenchContextKeysHandler extends Disposable {
 	private inputFocusedContext: IContextKey<boolean>;
 
@@ -57,10 +54,8 @@ export class WorkbenchContextKeysHandler extends Disposable {
 
 
 	private inZenModeContext: IContextKey<boolean>;
-	private isFullscreenContext: IContextKey<boolean>;
-	private isCenteredLayoutContext: IContextKey<boolean>;
+
 	private sideBarVisibleContext: IContextKey<boolean>;
-	private panelPositionContext: IContextKey<string>;
 
 	constructor(
 		@IContextKeyService private contextKeyService: IContextKeyService,
@@ -98,9 +93,6 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		}));
 
 		this._register(this.layoutService.onZenModeChange(enabled => this.inZenModeContext.set(enabled)));
-		this._register(this.layoutService.onFullscreenChange(fullscreen => this.isFullscreenContext.set(fullscreen)));
-		this._register(this.layoutService.onCenteredLayoutChange(centered => this.isCenteredLayoutContext.set(centered)));
-		this._register(this.layoutService.onPanelPositionChange(position => this.panelPositionContext.set(position)));
 
 		this._register(this.viewletService.onDidViewletClose(() => this.updateSideBarContextKeys()));
 		this._register(this.viewletService.onDidViewletOpen(() => this.updateSideBarContextKeys()));
@@ -148,21 +140,11 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		this.splitEditorsVerticallyContext = SplitEditorsVertically.bindTo(this.contextKeyService);
 		this.updateSplitEditorsVerticallyContext();
 
-		// Fullscreen
-		this.isFullscreenContext = IsFullscreenContext.bindTo(this.contextKeyService);
-
 		// Zen Mode
 		this.inZenModeContext = InEditorZenModeContext.bindTo(this.contextKeyService);
 
-		// Centered Layout
-		this.isCenteredLayoutContext = IsCenteredLayoutContext.bindTo(this.contextKeyService);
-
 		// Sidebar
 		this.sideBarVisibleContext = SideBarVisibleContext.bindTo(this.contextKeyService);
-
-		// Panel Position
-		this.panelPositionContext = PanelPositionContext.bindTo(this.contextKeyService);
-		this.panelPositionContext.set(this.layoutService.getPanelPosition() === Position.RIGHT ? 'right' : 'bottom');
 	}
 
 	private updateEditorContextKeys(): void {

src/vs/workbench/browser/labels.ts

@@ -94,8 +94,7 @@ export class ResourceLabels extends Disposable {
 		@IModelService private readonly modelService: IModelService,
 		@IDecorationsService private readonly decorationsService: IDecorationsService,
 		@IThemeService private readonly themeService: IThemeService,
-		@IFileService private readonly fileService: IFileService,
-		@ILabelService private readonly labelService: ILabelService
+		@IFileService private readonly fileService: IFileService
 	) {
 		super();
 
@@ -146,10 +145,6 @@ export class ResourceLabels extends Disposable {
 				this._widgets.forEach(widget => widget.notifyFileAssociationsChange());
 			}
 		}));
-
-		this._register(this.labelService.onDidChangeFormatters(() => {
-			this._widgets.forEach(widget => widget.notifyFormattersChange());
-		}));
 	}
 
 	get(index: number): IResourceLabel {
@@ -217,10 +212,9 @@ export class ResourceLabel extends ResourceLabels {
 		@IModelService modelService: IModelService,
 		@IDecorationsService decorationsService: IDecorationsService,
 		@IThemeService themeService: IThemeService,
-		@IFileService fileService: IFileService,
-		@ILabelService labelService: ILabelService
+		@IFileService fileService: IFileService
 	) {
-		super(DEFAULT_LABELS_CONTAINER, instantiationService, extensionService, configurationService, modelService, decorationsService, themeService, fileService, labelService);
+		super(DEFAULT_LABELS_CONTAINER, instantiationService, extensionService, configurationService, modelService, decorationsService, themeService, fileService);
 
 		this._label = this._register(this.create(container, options));
 	}
@@ -315,10 +309,6 @@ class ResourceLabelWidget extends IconLabel {
 		this.render(true);
 	}
 
-	notifyFormattersChange(): void {
-		this.render(false);
-	}
-
 	setResource(label: IResourceLabelProps, options?: IResourceLabelOptions): void {
 		const hasResourceChanged = this.hasResourceChanged(label, options);
 

src/vs/workbench/browser/layout.ts

@@ -5,11 +5,11 @@
 
 import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
-import { EventType, addDisposableListener, addClass, removeClass, isAncestor, getClientArea, position, size, EventHelper } from 'vs/base/browser/dom';
+import { EventType, addDisposableListener, addClass, removeClass, isAncestor, getClientArea, position, size } from 'vs/base/browser/dom';
 import { onDidChangeFullscreen, isFullscreen, getZoomFactor } from 'vs/base/browser/browser';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { isWindows, isLinux, isMacintosh, isWeb } from 'vs/base/common/platform';
+import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
 import { pathsToEditors } from 'vs/workbench/common/editor';
 import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
 import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
@@ -43,10 +43,7 @@ enum Settings {
 	SIDEBAR_POSITION = 'workbench.sideBar.location',
 	PANEL_POSITION = 'workbench.panel.defaultLocation',
 
-	ZEN_MODE_RESTORE = 'zenMode.restore',
-
-	// TODO @misolori remove before shipping stable
-	ICON_EXPLORATION_ENABLED = 'workbench.iconExploration.enabled'
+	ZEN_MODE_RESTORE = 'zenMode.restore'
 }
 
 enum Storage {
@@ -66,17 +63,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	private readonly _onTitleBarVisibilityChange: Emitter<void> = this._register(new Emitter<void>());
 	get onTitleBarVisibilityChange(): Event<void> { return this._onTitleBarVisibilityChange.event; }
 
-	private readonly _onZenModeChange: Emitter<boolean> = this._register(new Emitter<boolean>());
-	get onZenModeChange(): Event<boolean> { return this._onZenModeChange.event; }
-
-	private readonly _onFullscreenChange: Emitter<boolean> = this._register(new Emitter<boolean>());
-	get onFullscreenChange(): Event<boolean> { return this._onFullscreenChange.event; }
-
-	private readonly _onCenteredLayoutChange: Emitter<boolean> = this._register(new Emitter<boolean>());
-	get onCenteredLayoutChange(): Event<boolean> { return this._onCenteredLayoutChange.event; }
-
-	private readonly _onPanelPositionChange: Emitter<string> = this._register(new Emitter<string>());
-	get onPanelPositionChange(): Event<string> { return this._onPanelPositionChange.event; }
+	private readonly _onZenMode: Emitter<boolean> = this._register(new Emitter<boolean>());
+	get onZenModeChange(): Event<boolean> { return this._onZenMode.event; }
 
 	private readonly _onLayout = this._register(new Emitter<IDimension>());
 	get onLayout(): Event<IDimension> { return this._onLayout.event; }
@@ -160,11 +148,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			wasSideBarVisible: false,
 			wasPanelVisible: false,
 			transitionDisposeables: [] as IDisposable[]
-		},
-
-		// TODO @misolori remove before shipping stable
-		iconExploration: {
-			enabled: false
 		}
 	};
 
@@ -223,11 +206,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		// Prevent workbench from scrolling #55456
 		this._register(addDisposableListener(this.container, EventType.SCROLL, () => this.container.scrollTop = 0));
 
-		// Prevent native context menus in web #73781
-		if (isWeb) {
-			this._register(addDisposableListener(this.container, EventType.CONTEXT_MENU, (e) => EventHelper.stop(e, true)));
-		}
-
 		// Menubar visibility changes
 		if ((isWindows || isLinux) && getTitleBarStyle(this.configurationService, this.environmentService) === 'custom') {
 			this._register(this.titleService.onMenubarVisibilityChange(visible => this.onMenubarToggled(visible)));
@@ -264,8 +242,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this._onTitleBarVisibilityChange.fire();
 			this.layout(); // handle title bar when fullscreen changes
 		}
-
-		this._onFullscreenChange.fire(this.state.fullscreen);
 	}
 
 	private doUpdateLayoutConfiguration(skipLayout?: boolean): void {
@@ -298,12 +274,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		// Menubar visibility
 		const newMenubarVisibility = this.configurationService.getValue<MenuBarVisibility>(Settings.MENUBAR_VISIBLE);
 		this.setMenubarVisibility(newMenubarVisibility, !!skipLayout);
-
-		// TODO @misolori remove before shipping stable
-		// Icon exploration on setting change
-		const newIconExplorationEnabled = this.configurationService.getValue<boolean>(Settings.ICON_EXPLORATION_ENABLED);
-		this.setIconExploration(newIconExplorationEnabled);
-
 	}
 
 	private setSideBarPosition(position: Position): void {
@@ -416,11 +386,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		// Zen mode enablement
 		this.state.zenMode.restore = this.storageService.getBoolean(Storage.ZEN_MODE_ENABLED, StorageScope.WORKSPACE, false) && this.configurationService.getValue(Settings.ZEN_MODE_RESTORE);
-
-		// TODO @misolori remove before shipping stable
-		// Icon exploration
-		this.state.iconExploration.enabled = this.configurationService.getValue<boolean>(Settings.ICON_EXPLORATION_ENABLED);
-		this.setIconExploration(this.state.iconExploration.enabled);
 	}
 
 	private resolveEditorsToOpen(fileService: IFileService): Promise<IResourceEditor[]> | IResourceEditor[] {
@@ -666,7 +631,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		}
 
 		// Event
-		this._onZenModeChange.fire(this.state.zenMode.active);
+		this._onZenMode.fire(this.state.zenMode.active);
 	}
 
 	private setStatusBarHidden(hidden: boolean, skipLayout?: boolean): void {
@@ -689,19 +654,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		}
 	}
 
-	// TODO @misolori remove before shipping stable
-	private setIconExploration(enabled: boolean): void {
-		this.state.iconExploration.enabled = enabled;
-
-		// Update DOM
-		if (enabled) {
-			document.body.dataset.exploration = 'icon-exploration';
-		} else {
-			document.body.dataset.exploration = '';
-		}
-
-	}
-
 	protected createWorkbenchLayout(instantiationService: IInstantiationService): void {
 		const titleBar = this.getPart(Parts.TITLEBAR_PART);
 		const editorPart = this.getPart(Parts.EDITOR_PART);
@@ -876,8 +828,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 				this.layout();
 			}
 		}
-
-		this._onCenteredLayoutChange.fire(this.state.editor.centered);
 	}
 
 	resizePart(part: Parts, sizeChange: number): void {
@@ -1119,8 +1069,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		} else {
 			this.workbenchGrid.layout();
 		}
-
-		this._onPanelPositionChange.fire(positionToString(this.state.panel.position));
 	}
 
 	private savePanelDimension(): void {

src/vs/workbench/browser/legacyLayout.ts

@@ -10,14 +10,14 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { isMacintosh, isWeb } from 'vs/base/common/platform';
+import { isMacintosh } from 'vs/base/common/platform';
 import { memoize } from 'vs/base/common/decorators';
 import { Dimension, getClientArea, size, position, hide, show } from 'vs/base/browser/dom';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { getZoomFactor } from 'vs/base/browser/browser';
 import { Part } from 'vs/workbench/browser/part';
 
-const TITLE_BAR_HEIGHT = isMacintosh && !isWeb ? 22 : 30;
+const TITLE_BAR_HEIGHT = isMacintosh ? 22 : 30;
 const STATUS_BAR_HEIGHT = 22;
 const ACTIVITY_BAR_WIDTH = 50;
 

src/vs/workbench/browser/media/images/activitybar/debug-alt1.svg

@@ -1,18 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path d="M13.023 13.5665L15.675 10.913L14.6175 9.85403L11.964 12.5075L9.38099 9.92603L8.32349 10.9835L10.9065 13.5665L8.25449 16.22L9.31199 17.2775L11.9655 14.6255L14.688 17.3465L15.7455 16.289L13.023 13.5665Z" fill="white"/>
-<path d="M4.24016 12.4989L0.00115967 12.5045L0.00311923 14.0015L4.24212 13.9959L4.24016 12.4989Z" fill="white"/>
-<path d="M24 12.5H20.085V14H24V12.5Z" fill="white"/>
-<path d="M3.68029 3.87413L2.62314 4.93405L5.98771 8.28982L7.04486 7.2299L3.68029 3.87413Z" fill="white"/>
-<path d="M18.2479 18.4368L17.1873 19.4975L20.1911 22.5013L21.2517 21.4406L18.2479 18.4368Z" fill="white"/>
-<path d="M20.2847 3.90364L17.0981 7.09805L18.158 8.15528L21.3445 4.96086L20.2847 3.90364Z" fill="white"/>
-<path d="M5.75325 18.4362L2.78128 21.4082L3.84194 22.4688L6.81391 19.4969L5.75325 18.4362Z" fill="white"/>
-<path d="M17.382 7.98648C18.4679 9.45106 19.0604 11.2228 19.074 13.046C19.074 17.546 15.9765 21.2075 12.174 21.2075C8.37149 21.2075 5.27398 17.546 5.27398 13.046C5.22522 11.2489 5.73572 9.48096 6.73498 7.98648H17.385H17.382ZM18.117 6.48648H5.98648C4.48996 8.3394 3.70286 10.665 3.76648 13.046C3.76648 18.3815 7.52849 22.7075 12.1665 22.7075C16.8045 22.7075 20.5665 18.3815 20.5665 13.046C20.5487 10.6372 19.677 8.31291 18.1065 6.48648H18.117Z" fill="white"/>
-<path d="M9.417 7C9.14696 6.54603 9.003 6.02821 9 5.5C9 4.70435 9.31607 3.94129 9.87868 3.37868C10.4413 2.81607 11.2044 2.5 12 2.5C12.7956 2.5 13.5587 2.81607 14.1213 3.37868C14.6839 3.94129 15 4.70435 15 5.5C14.997 6.02821 14.853 6.54603 14.583 7H16.224C16.4018 6.51965 16.4951 6.01217 16.5 5.5C16.5 4.30653 16.0259 3.16193 15.182 2.31802C14.3381 1.47411 13.1935 1 12 1C10.8065 1 9.66193 1.47411 8.81802 2.31802C7.97411 3.16193 7.5 4.30653 7.5 5.5C7.50485 6.01217 7.59823 6.51965 7.776 7H9.417Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
-</svg>

src/vs/workbench/browser/media/images/activitybar/extensions-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.5 0V10.5H24V0H13.5ZM22.5 9H15V1.5H22.5V9ZM10.5 4.5H0V24H19.5V13.5H10.5V4.5ZM9 22.5H1.5V15H9V22.5ZM9 13.5H1.5V6H9V13.5ZM18 15V22.5H10.5V15H18Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/activitybar/files-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 5H3V23H18V18H17V22H4V6H8V5Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21 7V18H8V2H16V6V7H17H21ZM16 1H7V19H22V7V6L17 1H16ZM17 2.41421L20.5858 6H17V2.41421Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/activitybar/git-alt1.svg

@@ -1,15 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<g clip-path="url(#clip1)">
-<path d="M21.7001 6.79651C21.3124 5.90153 20.5985 5.18769 19.7036 4.80001C19.2455 4.59916 18.7502 4.49695 18.2501 4.50001C17.748 4.4974 17.2509 4.59957 16.7906 4.80001C16.3435 4.99198 15.9364 5.26624 15.5906 5.60851C15.2504 5.95083 14.9781 6.35443 14.7881 6.79801C14.5935 7.25714 14.4955 7.75138 14.5001 8.25001C14.4977 8.67564 14.5713 9.09827 14.7176 9.498C14.8594 9.88691 15.0619 10.2509 15.3176 10.5765C15.5726 10.9022 15.8816 11.1817 16.2311 11.403C16.59 11.6308 16.9844 11.7971 17.3981 11.895C17.3285 12.1273 17.2216 12.3466 17.0816 12.5445C16.9452 12.7392 16.7792 12.9113 16.5896 13.0545C16.4011 13.196 16.1916 13.3069 15.9686 13.383C15.7373 13.462 15.4944 13.5015 15.2501 13.5H10.7501C10.3471 13.4992 9.94696 13.5666 9.56656 13.6995C9.18255 13.8326 8.82245 14.0265 8.50006 14.274V7.41751C8.925 7.3351 9.33154 7.17655 9.70006 6.94951C10.0599 6.72813 10.3807 6.44888 10.6496 6.123C10.9168 5.7956 11.1267 5.42539 11.2706 5.02801C11.4219 4.61889 11.4996 4.18621 11.5001 3.75001C11.5031 3.24983 11.4009 2.7546 11.2001 2.29651C10.8124 1.40153 10.0985 0.687688 9.20356 0.300006C8.74547 0.09916 8.25024 -0.00305398 7.75006 5.67945e-06C7.24799 -0.00260461 6.7509 0.0995727 6.29056 0.300006C5.84346 0.491981 5.4364 0.766237 5.09056 1.10851C4.75042 1.45083 4.47813 1.85443 4.28806 2.29801C4.09351 2.75714 3.99548 3.25138 4.00006 3.75001C3.99744 4.61508 4.29602 5.45408 4.84456 6.123C5.11251 6.4492 5.43289 6.72851 5.79256 6.94951C6.16337 7.17739 6.57253 7.33597 7.00006 7.41751V16.5825C6.57253 16.664 6.16337 16.8226 5.79256 17.0505C5.43289 17.2715 5.11251 17.5508 4.84456 17.877C4.29602 18.5459 3.99744 19.3849 4.00006 20.25C3.99715 20.7513 4.09669 21.248 4.29256 21.7095C4.67082 22.6117 5.38834 23.3293 6.29056 23.7075C6.75207 23.9034 7.24872 24.0029 7.75006 24C8.25004 24.001 8.74484 23.8989 9.20356 23.7C9.64714 23.5099 10.0507 23.2376 10.3931 22.8975C10.7353 22.5517 11.0096 22.1446 11.2016 21.6975C11.569 20.8401 11.5979 19.8754 11.2826 18.9975C11.0031 18.2152 10.4718 17.5477 9.77206 17.1C9.41409 16.8691 9.01947 16.7007 8.60506 16.602C8.74549 16.1399 9.02848 15.734 9.41356 15.4425C9.60199 15.301 9.81157 15.1902 10.0346 15.114C10.265 15.0364 10.5069 14.9979 10.7501 15H15.2501C15.6898 15.0022 16.1263 14.925 16.5386 14.772C16.9393 14.6224 17.312 14.4063 17.6411 14.133C17.9702 13.8581 18.2497 13.5289 18.4676 13.1595C18.6918 12.7794 18.8482 12.3632 18.9296 11.9295C19.3645 11.8551 19.7817 11.6999 20.1596 11.472C20.9019 11.0303 21.4709 10.3481 21.7721 9.53851C21.925 9.12624 22.0023 8.68973 22.0001 8.25001C22.0031 7.74983 21.9009 7.2546 21.7001 6.79651ZM6.87106 5.82451C6.32931 5.59715 5.89842 5.16626 5.67106 4.62451C5.55521 4.34593 5.49556 4.04721 5.49556 3.74551C5.49556 3.4438 5.55521 3.14508 5.67106 2.86651C5.8991 2.32521 6.32976 1.89454 6.87106 1.66651C7.14963 1.55065 7.44836 1.49101 7.75006 1.49101C8.05176 1.49101 8.35049 1.55065 8.62906 1.66651C9.17082 1.89386 9.60171 2.32475 9.82906 2.86651C9.94492 3.14508 10.0046 3.4438 10.0046 3.74551C10.0046 4.04721 9.94492 4.34593 9.82906 4.62451C9.60294 5.16709 9.17164 5.59838 8.62906 5.82451C8.35049 5.94036 8.05176 6.00001 7.75006 6.00001C7.44836 6.00001 7.14963 5.94036 6.87106 5.82451ZM8.62906 18.1755C9.17082 18.4029 9.60171 18.8338 9.82906 19.3755C9.94492 19.6541 10.0046 19.9528 10.0046 20.2545C10.0046 20.5562 9.94492 20.8549 9.82906 21.1335C9.60294 21.6761 9.17164 22.1074 8.62906 22.3335C8.35049 22.4494 8.05176 22.509 7.75006 22.509C7.44836 22.509 7.14963 22.4494 6.87106 22.3335C6.32931 22.1061 5.89842 21.6753 5.67106 21.1335C5.55521 20.8549 5.49556 20.5562 5.49556 20.2545C5.49556 19.9528 5.55521 19.6541 5.67106 19.3755C5.8991 18.8342 6.32976 18.4035 6.87106 18.1755C7.14963 18.0596 7.44836 18 7.75006 18C8.05176 18 8.35049 18.0596 8.62906 18.1755ZM20.3291 9.12901C20.1029 9.67159 19.6716 10.1029 19.1291 10.329C18.8505 10.4449 18.5518 10.5045 18.2501 10.5045C17.9484 10.5045 17.6496 10.4449 17.3711 10.329C16.8293 10.1016 16.3984 9.67076 16.1711 9.12901C16.0552 8.85043 15.9956 8.55171 15.9956 8.25001C15.9956 7.9483 16.0552 7.64958 16.1711 7.37101C16.3991 6.82971 16.8298 6.39904 17.3711 6.17101C17.6496 6.05515 17.9484 5.99551 18.2501 5.99551C18.5518 5.99551 18.8505 6.05515 19.1291 6.17101C19.6708 6.39836 20.1017 6.82925 20.3291 7.37101C20.4449 7.64958 20.5046 7.9483 20.5046 8.25001C20.5046 8.55171 20.4449 8.85043 20.3291 9.12901Z" fill="white"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-<clipPath id="clip1">
-<rect width="24" height="24" fill="white" transform="translate(1)"/>
-</clipPath>
-</defs>
-</svg>

src/vs/workbench/browser/media/images/activitybar/more-alt1.svg

@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 12C6 12.2967 5.91203 12.5867 5.74721 12.8334C5.58238 13.08 5.34812 13.2723 5.07403 13.3858C4.79994 13.4994 4.49834 13.5291 4.20737 13.4712C3.91639 13.4133 3.64912 13.2704 3.43934 13.0607C3.22956 12.8509 3.0867 12.5836 3.02882 12.2926C2.97094 12.0017 3.00065 11.7001 3.11418 11.426C3.22771 11.1519 3.41997 10.9176 3.66665 10.7528C3.91332 10.588 4.20333 10.5 4.5 10.5C4.89783 10.5 5.27936 10.658 5.56066 10.9393C5.84197 11.2206 6 11.6022 6 12Z" fill="white"/>
-<path d="M13.5 12C13.5 12.2967 13.412 12.5867 13.2472 12.8334C13.0824 13.08 12.8481 13.2723 12.574 13.3858C12.2999 13.4994 11.9983 13.5291 11.7074 13.4712C11.4164 13.4133 11.1491 13.2704 10.9393 13.0607C10.7296 12.8509 10.5867 12.5836 10.5288 12.2926C10.4709 12.0017 10.5006 11.7001 10.6142 11.426C10.7277 11.1519 10.92 10.9176 11.1666 10.7528C11.4133 10.588 11.7033 10.5 12 10.5C12.3978 10.5 12.7794 10.658 13.0607 10.9393C13.342 11.2206 13.5 11.6022 13.5 12Z" fill="white"/>
-<path d="M21 12C21 12.2967 20.912 12.5867 20.7472 12.8334C20.5824 13.08 20.3481 13.2723 20.074 13.3858C19.7999 13.4994 19.4983 13.5291 19.2074 13.4712C18.9164 13.4133 18.6491 13.2704 18.4393 13.0607C18.2296 12.8509 18.0867 12.5836 18.0288 12.2926C17.9709 12.0017 18.0006 11.7001 18.1142 11.426C18.2277 11.1519 18.42 10.9176 18.6666 10.7528C18.9133 10.588 19.2033 10.5 19.5 10.5C19.8978 10.5 20.2794 10.658 20.5607 10.9393C20.842 11.2206 21 11.6022 21 12Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/activitybar/search-alt1.svg

@@ -1,10 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3958 8.37499C22.3958 12.1144 19.3644 15.1458 15.625 15.1458C11.8856 15.1458 8.85418 12.1144 8.85418 8.37499C8.85418 4.63556 11.8856 1.60416 15.625 1.60416C19.3644 1.60416 22.3958 4.63556 22.3958 8.37499ZM23.9583 8.37499C23.9583 12.9774 20.2274 16.7083 15.625 16.7083C13.7137 16.7083 11.9527 16.0649 10.5468 14.9828L1.7496 23.3263L0.673431 22.1935L9.40082 13.9162C8.08887 12.4436 7.29168 10.5024 7.29168 8.37499C7.29168 3.77262 11.0226 0.0416565 15.625 0.0416565C20.2274 0.0416565 23.9583 3.77262 23.9583 8.37499ZM1.75914 22.9583L1.76184 22.9558L1.75919 22.9583L1.75914 22.9583Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
-</svg>

src/vs/workbench/browser/media/images/activitybar/settings-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20.8945 11.5781C20.8945 11.6484 20.8945 11.7188 20.8945 11.7891C20.9023 11.8594 20.9062 11.9297 20.9062 12C20.9062 12.0703 20.9023 12.1406 20.8945 12.2109C20.8945 12.2812 20.8945 12.3516 20.8945 12.4219L23.9297 14.3086L22.0664 18.7969L18.5859 18C18.3984 18.2031 18.2031 18.3984 18 18.5859L18.7969 22.0664L14.3086 23.9297L12.4219 20.8945C12.3516 20.8945 12.2812 20.8984 12.2109 20.9062C12.1406 20.9062 12.0703 20.9062 12 20.9062C11.9297 20.9062 11.8594 20.9062 11.7891 20.9062C11.7188 20.8984 11.6484 20.8945 11.5781 20.8945L9.69141 23.9297L5.20312 22.0664L6 18.5859C5.79688 18.3984 5.60156 18.2031 5.41406 18L1.93359 18.7969L0.0703125 14.3086L3.10547 12.4219C3.10547 12.3516 3.10156 12.2812 3.09375 12.2109C3.09375 12.1406 3.09375 12.0703 3.09375 12C3.09375 11.9297 3.09375 11.8594 3.09375 11.7891C3.10156 11.7188 3.10547 11.6484 3.10547 11.5781L0.0703125 9.69141L1.93359 5.20312L5.41406 6C5.60156 5.79688 5.79688 5.60156 6 5.41406L5.20312 1.93359L9.69141 0.0703125L11.5781 3.10547C11.6484 3.10547 11.7188 3.10547 11.7891 3.10547C11.8594 3.09766 11.9297 3.09375 12 3.09375C12.0703 3.09375 12.1406 3.09766 12.2109 3.10547C12.2812 3.10547 12.3516 3.10547 12.4219 3.10547L14.3086 0.0703125L18.7969 1.93359L18 5.41406C18.2031 5.60156 18.3984 5.79688 18.5859 6L22.0664 5.20312L23.9297 9.69141L20.8945 11.5781ZM19.5234 13.1016C19.5391 12.9141 19.5547 12.7305 19.5703 12.5508C19.5859 12.3633 19.5938 12.1758 19.5938 11.9883C19.5938 11.8086 19.5859 11.625 19.5703 11.4375C19.5547 11.25 19.5391 11.0664 19.5234 10.8867L22.2891 9.16406L21.2812 6.72656L18.1055 7.46484C17.8633 7.16797 17.6133 6.89453 17.3555 6.64453C17.1055 6.39453 16.832 6.14453 16.5352 5.89453L17.2734 2.71875L14.8359 1.71094L13.1016 4.47656C12.9219 4.46094 12.7383 4.44531 12.5508 4.42969C12.3633 4.41406 12.1797 4.40625 12 4.40625C11.8125 4.40625 11.625 4.41406 11.4375 4.42969C11.2578 4.44531 11.0742 4.46094 10.8867 4.47656L9.16406 1.71094L6.72656 2.71875L7.46484 5.89453C7.16797 6.13672 6.89453 6.38672 6.64453 6.64453C6.39453 6.89453 6.14453 7.16797 5.89453 7.46484L2.71875 6.72656L1.71094 9.16406L4.47656 10.8984C4.46094 11.0859 4.44531 11.2734 4.42969 11.4609C4.41406 11.6406 4.40625 11.8242 4.40625 12.0117C4.40625 12.1914 4.41406 12.375 4.42969 12.5625C4.44531 12.75 4.46094 12.9336 4.47656 13.1133L1.71094 14.8359L2.71875 17.2734L5.89453 16.5352C6.13672 16.832 6.38281 17.1055 6.63281 17.3555C6.89062 17.6055 7.16797 17.8555 7.46484 18.1055L6.72656 21.2812L9.16406 22.2891L10.8984 19.5234C11.0781 19.5391 11.2617 19.5547 11.4492 19.5703C11.6367 19.5859 11.8203 19.5938 12 19.5938C12.1875 19.5938 12.3711 19.5859 12.5508 19.5703C12.7383 19.5547 12.9258 19.5391 13.1133 19.5234L14.8359 22.2891L17.2734 21.2812L16.5352 18.1055C16.832 17.8633 17.1055 17.6172 17.3555 17.3672C17.6055 17.1094 17.8555 16.832 18.1055 16.5352L21.2812 17.2734L22.2891 14.8359L19.5234 13.1016ZM12 7.59375C12.6094 7.59375 13.1797 7.71094 13.7109 7.94531C14.25 8.17188 14.7188 8.48438 15.1172 8.88281C15.5156 9.28125 15.8281 9.75 16.0547 10.2891C16.2891 10.8203 16.4062 11.3906 16.4062 12C16.4062 12.6094 16.2891 13.1836 16.0547 13.7227C15.8281 14.2539 15.5156 14.7188 15.1172 15.1172C14.7188 15.5156 14.25 15.832 13.7109 16.0664C13.1797 16.293 12.6094 16.4062 12 16.4062C11.3906 16.4062 10.8164 16.293 10.2773 16.0664C9.74609 15.832 9.28125 15.5156 8.88281 15.1172C8.48438 14.7188 8.16797 14.2539 7.93359 13.7227C7.70703 13.1836 7.59375 12.6094 7.59375 12C7.59375 11.3906 7.70703 10.8203 7.93359 10.2891C8.16797 9.75 8.48438 9.28125 8.88281 8.88281C9.28125 8.48438 9.74609 8.17188 10.2773 7.94531C10.8164 7.71094 11.3906 7.59375 12 7.59375ZM12 15.0938C12.4297 15.0938 12.832 15.0156 13.207 14.8594C13.582 14.6953 13.9102 14.4727 14.1914 14.1914C14.4727 13.9102 14.6914 13.582 14.8477 13.207C15.0117 12.832 15.0938 12.4297 15.0938 12C15.0938 11.5703 15.0117 11.168 14.8477 10.793C14.6914 10.418 14.4727 10.0898 14.1914 9.80859C13.9102 9.52734 13.582 9.30859 13.207 9.15234C12.832 8.98828 12.4297 8.90625 12 8.90625C11.5703 8.90625 11.168 8.98828 10.793 9.15234C10.418 9.30859 10.0898 9.52734 9.80859 9.80859C9.52734 10.0898 9.30469 10.418 9.14062 10.793C8.98438 11.168 8.90625 11.5703 8.90625 12C8.90625 12.4297 8.98438 12.832 9.14062 13.207C9.30469 13.582 9.52734 13.9102 9.80859 14.1914C10.0898 14.4727 10.418 14.6953 10.793 14.8594C11.168 15.0156 11.5703 15.0938 12 15.0938Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/add-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14 7V8H8V14H7V8H1V7H7V1H8V7H14Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/breakpoint-activate-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.9991 5.50086C15.0304 6.61914 14.634 7.70724 13.8907 8.54338C13.1475 9.37951 12.1134 9.90076 10.9991 10.0009C10.9909 9.65846 10.9232 9.3201 10.7991 9.00086C11.6689 8.91142 12.4755 8.50543 13.0655 7.86012C13.6555 7.21481 13.9878 6.37517 13.9991 5.50086C13.9959 4.59897 13.6452 3.733 13.0201 3.08289C12.395 2.43277 11.5434 2.04849 10.6423 2.00987C9.74125 1.97125 8.85994 2.28127 8.18148 2.87552C7.50302 3.46977 7.07959 4.30255 6.99915 5.20086C6.67717 5.08644 6.34037 5.01908 5.99915 5.00086C6.14761 3.90646 6.68305 2.90139 7.50851 2.16765C8.33397 1.4339 9.39488 1.01999 10.4991 1.00086C11.0908 0.99835 11.6771 1.11303 12.2242 1.33829C12.7713 1.56354 13.2684 1.89491 13.6867 2.31328C14.1051 2.73164 14.4365 3.22872 14.6617 3.77582C14.887 4.32292 15.0017 4.90921 14.9991 5.50086ZM5.49915 6.00086C4.60913 6.00086 3.7391 6.26478 2.99908 6.75925C2.25906 7.25372 1.68228 7.95652 1.34169 8.77879C1.0011 9.60106 0.91198 10.5059 1.08561 11.3788C1.25925 12.2517 1.68783 13.0535 2.31717 13.6828C2.9465 14.3122 3.74833 14.7408 4.62124 14.9144C5.49416 15.088 6.39896 14.9989 7.22122 14.6583C8.04349 14.3177 8.74629 13.741 9.24076 13.0009C9.73523 12.2609 9.99915 11.3909 9.99915 10.5009C9.99915 9.90992 9.88275 9.32475 9.65661 8.77879C9.43046 8.23282 9.09899 7.73675 8.68113 7.31888C8.26326 6.90102 7.76719 6.56955 7.22122 6.34341C6.67526 6.11726 6.0901 6.00086 5.49915 6.00086Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/breakpoint-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 4C8.36719 4 8.72135 4.04818 9.0625 4.14453C9.40365 4.23828 9.72135 4.3724 10.0156 4.54688C10.3125 4.72135 10.582 4.93099 10.8242 5.17578C11.069 5.41797 11.2786 5.6875 11.4531 5.98438C11.6276 6.27865 11.7617 6.59635 11.8555 6.9375C11.9518 7.27865 12 7.63281 12 8C12 8.36719 11.9518 8.72135 11.8555 9.0625C11.7617 9.40365 11.6276 9.72266 11.4531 10.0195C11.2786 10.3138 11.069 10.5833 10.8242 10.8281C10.582 11.0703 10.3125 11.2786 10.0156 11.4531C9.72135 11.6276 9.40365 11.763 9.0625 11.8594C8.72135 11.9531 8.36719 12 8 12C7.63281 12 7.27865 11.9531 6.9375 11.8594C6.59635 11.763 6.27734 11.6276 5.98047 11.4531C5.6862 11.2786 5.41667 11.0703 5.17188 10.8281C4.92969 10.5833 4.72135 10.3138 4.54688 10.0195C4.3724 9.72266 4.23698 9.40365 4.14063 9.0625C4.04688 8.72135 4 8.36719 4 8C4 7.63281 4.04688 7.27865 4.14063 6.9375C4.23698 6.59635 4.3724 6.27865 4.54688 5.98438C4.72135 5.6875 4.92969 5.41797 5.17188 5.17578C5.41667 4.93099 5.6862 4.72135 5.98047 4.54688C6.27734 4.3724 6.59635 4.23828 6.9375 4.14453C7.27865 4.04818 7.63281 4 8 4Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/breakpoint-conditional-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 8C4 5.79086 5.79086 4 8 4C10.2091 4 12 5.79086 12 8C12 10.2091 10.2091 12 8 12C5.79086 12 4 10.2091 4 8ZM6.28571 9.71429L6.28571 8.57143L9.71429 8.57143L9.71429 9.71429L6.28571 9.71429ZM6.28572 6.28571L6.28572 7.42857L9.71429 7.42857L9.71429 6.28571L6.28572 6.28571Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/breakpoint-function-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99995 3.71429L12.2857 11.5714H3.71423L7.99995 3.71429Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/breakpoint-function-disabled-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99995 3.71429L12.2857 11.5714H3.71423L7.99995 3.71429Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/breakpoint-function-unverified-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.62587 11.2143L7.64286 4.41632L11.6598 11.2143H3.62587Z" stroke="white" stroke-width="0.714286"/>
-</svg>

src/vs/workbench/browser/media/images/debug/breakpoint-log-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99995 3.71429L12.2857 8.00001L7.99995 12.2857L3.71423 8.00001L7.99995 3.71429Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/breakpoint-log-unverified-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.97449 4.21937L11.7297 7.97458L7.97449 11.7298L4.21928 7.97458L7.97449 4.21937Z" stroke="white" stroke-width="0.714286"/>
-</svg>

src/vs/workbench/browser/media/images/debug/breakpoint-unverified-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 12C10.2091 12 12 10.2091 12 8C12 5.79086 10.2091 4 8 4C5.79086 4 4 5.79086 4 8C4 10.2091 5.79086 12 8 12ZM8 10.8571C9.57796 10.8571 10.8571 9.57796 10.8571 8C10.8571 6.42204 9.57796 5.14286 8 5.14286C6.42204 5.14286 5.14286 6.42204 5.14286 8C5.14286 9.57796 6.42204 10.8571 8 10.8571Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/close-alt1.svg

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13 3H6V5H11V10H13V3ZM11 11H14V2H5V5H2V14H11V11ZM10 11V10V6H6H5H3V13H10V11Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.24444 11.8258L4.17419 7.7555L4.92969 7L8.99994 11.0703L8.24444 11.8258Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.82569 7.7555L4.75544 11.8258L3.99994 11.0703L8.07019 7L8.82569 7.7555Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/continue-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 14V2.18094L15 8.06218L6 14ZM7.50023 5L12.3148 8.06218L7.50023 11.1809L7.50023 5Z" fill="#75BEFF"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2L2.5 2L2.5 14L4 14L4 2.24001L4 2Z" fill="#75BEFF"/>
-</svg>

src/vs/workbench/browser/media/images/debug/current-and-breakpoint-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8288 8L8.45377 13H3V3H8.45377L12.8288 8ZM8 12L11.5 8L8 4H4V12H8Z" fill="white"/>
-<path d="M9 8C9 8.39556 8.8827 8.78224 8.66294 9.11114C8.44318 9.44004 8.13082 9.69638 7.76537 9.84776C7.39992 9.99913 6.99778 10.0387 6.60982 9.96157C6.22186 9.8844 5.86549 9.69392 5.58579 9.41421C5.30608 9.13451 5.1156 8.77814 5.03843 8.39018C4.96126 8.00222 5.00087 7.60009 5.15224 7.23463C5.30362 6.86918 5.55996 6.55682 5.88886 6.33706C6.21776 6.1173 6.60444 6 7 6C7.53043 6 8.03914 6.21071 8.41421 6.58579C8.78929 6.96086 9 7.46957 9 8Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/current-arrow-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8288 8L8.45377 13H3V3H8.45377L12.8288 8ZM8 12L11.5 8L8 4H4V12H8Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/disconnect-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.6172 3.84375C13.5169 3.5293 13.3665 3.23991 13.166 2.97559L14.5195 1.61523L13.9043 1L12.5439 2.35352C12.2796 2.15299 11.9902 2.0026 11.6758 1.90234C11.3659 1.79753 11.0446 1.74512 10.7119 1.74512C10.3063 1.74512 9.91439 1.82259 9.53613 1.97754C9.16243 2.13249 8.83203 2.35352 8.54492 2.64062L7 4.19238L11.3271 8.51953L12.8789 6.97461C13.166 6.6875 13.387 6.3571 13.542 5.9834C13.6969 5.60514 13.7744 5.21322 13.7744 4.80762C13.7744 4.47493 13.722 4.15365 13.6172 3.84375ZM12.7285 5.64844C12.6191 5.91276 12.4619 6.14746 12.2568 6.35254L11.3271 7.28223L8.2373 4.19238L9.16699 3.2627C9.37207 3.05762 9.60677 2.90039 9.87109 2.79102C10.14 2.67708 10.4202 2.62012 10.7119 2.62012C11.0127 2.62012 11.2952 2.67936 11.5596 2.79785C11.8239 2.91178 12.054 3.06901 12.25 3.26953C12.4505 3.46549 12.6077 3.69564 12.7217 3.95996C12.8402 4.22428 12.8994 4.50684 12.8994 4.80762C12.8994 5.09928 12.8424 5.37956 12.7285 5.64844ZM7.9043 10.6416L9.3877 9.09668L8.77246 8.47461L7.28223 10.0264L5.42285 8.16699L6.91309 6.61523L6.29102 6L4.80762 7.54492L4.19238 6.92969L2.64062 8.47461C2.35352 8.76172 2.13249 9.0944 1.97754 9.47266C1.82259 9.84635 1.74512 10.236 1.74512 10.6416C1.74512 10.9743 1.79525 11.2979 1.89551 11.6123C2.00033 11.9222 2.15299 12.2093 2.35352 12.4736L1 13.834L1.61523 14.4492L2.97559 13.0957C3.23991 13.2962 3.52702 13.4489 3.83691 13.5537C4.15137 13.654 4.47493 13.7041 4.80762 13.7041C5.21322 13.7041 5.60286 13.6266 5.97656 13.4717C6.35482 13.3167 6.6875 13.0957 6.97461 12.8086L8.51953 11.2568L7.9043 10.6416ZM5.6416 12.665C5.37728 12.7744 5.09928 12.8291 4.80762 12.8291C4.50684 12.8291 4.22201 12.7721 3.95312 12.6582C3.6888 12.5443 3.45638 12.3893 3.25586 12.1934C3.0599 11.9928 2.90495 11.7604 2.79102 11.4961C2.67708 11.2272 2.62012 10.9424 2.62012 10.6416C2.62012 10.3499 2.6748 10.0719 2.78418 9.80762C2.89811 9.53874 3.05762 9.30176 3.2627 9.09668L4.19238 8.16699L7.28223 11.2568L6.35254 12.1865C6.14746 12.3916 5.91048 12.5511 5.6416 12.665Z" fill="#F48771"/>
-</svg>

src/vs/workbench/browser/media/images/debug/drag-alt1.svg

@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="5" y="3" width="2" height="2" fill="#848484"/>
-<rect x="5" y="7" width="2" height="2" fill="#848484"/>
-<rect x="5" y="11" width="2" height="2" fill="#848484"/>
-<rect x="9" y="3" width="2" height="2" fill="#848484"/>
-<rect x="9" y="7" width="2" height="2" fill="#848484"/>
-<rect x="9" y="11" width="2" height="2" fill="#848484"/>
-</svg>

src/vs/workbench/browser/media/images/debug/gear-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.10564 3.42309L6.59373 1H9.40633L9.89442 3.42309L11.9663 2.05164L13.9409 4.0122L12.5596 6.06938L15.0001 6.554V9.34663L12.5596 9.83125L13.9409 11.8884L11.9663 13.849L9.91208 12.4892L9.40633 15H6.59373L6.10564 12.5769L4.03374 13.9484L2.05916 11.9878L3.45077 9.91521L1 9.3312V6.554L3.44042 6.06938L2.05916 4.0122L4.03374 2.05164L6.10564 3.42309ZM8.5954 1.98215H7.40466L6.92747 4.35115L6.12544 4.6166L4.15978 3.31546L3.33203 4.13734L4.64247 6.08904L4.37512 6.88537L1.98918 7.35917V8.55688L4.37907 9.12638L4.64247 9.91096L3.33203 11.8627L4.15978 12.6845L6.12544 11.3834L6.92747 11.6488L7.40466 14.0178H8.5954L9.05648 11.7288L9.80154 11.2357L11.8403 12.5852L12.668 11.7633L11.3576 9.81159L11.6249 9.01526L14.0109 8.54146V7.35917L11.6249 6.88537L11.3576 6.08904L12.668 4.13734L11.8403 3.31546L9.87462 4.6166L9.07259 4.35115L8.5954 1.98215Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 9C8.55228 9 9 8.55228 9 8C9 7.44772 8.55228 7 8 7C7.44772 7 7 7.44772 7 8C7 8.55228 7.44772 9 8 9ZM8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/pause-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 3L6 3V13H4.5V3ZM11.5 3V13H10V3L11.5 3Z" fill="#89D185"/>
-</svg>

src/vs/workbench/browser/media/images/debug/repl-alt1.svg

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 1H15V14H1V1ZM2 13H14V2H2V13Z" fill="white"/>
-<rect x="4.00006" y="4.67157" width="1" height="5" transform="rotate(-45 4.00006 4.67157)" fill="white"/>
-<rect x="4.70709" y="11.0356" width="1" height="5" transform="rotate(-135 4.70709 11.0356)" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/restart-alt1.svg

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 7.5L2 3L3.5 3L3.5 7.5L2 7.5Z" fill="#89D185"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 6L6.5 6L6.5 7.5L2 7.5L2 6Z" fill="#89D185"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.49997 12.5C10.9853 12.5 13 10.4853 13 8C13 5.51472 10.9853 3.5 8.49997 3.5C6.77248 3.5 5.27233 4.47341 4.51812 5.90166L2.67285 6.5642C3.31632 3.94385 5.68114 2 8.49997 2C11.8137 2 14.5 4.68629 14.5 8C14.5 11.3137 11.8137 14 8.49997 14C6.19202 14 4.18842 12.6969 3.18479 10.7863L4.61522 10.2727C5.39647 11.6052 6.84373 12.5 8.49997 12.5Z" fill="#89D185"/>
-</svg>

src/vs/workbench/browser/media/images/debug/stackframe-and-breakpoint-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8288 8L8.45377 13H3V3H8.45377L12.8288 8ZM8 12L11.5 8L8 4H4V12H8Z" fill="white"/>
-<path d="M9 8C9 8.39556 8.8827 8.78224 8.66294 9.11114C8.44318 9.44004 8.13082 9.69638 7.76537 9.84776C7.39992 9.99913 6.99778 10.0387 6.60982 9.96157C6.22186 9.8844 5.86549 9.69392 5.58579 9.41421C5.30608 9.13451 5.1156 8.77814 5.03843 8.39018C4.96126 8.00222 5.00087 7.60009 5.15224 7.23463C5.30362 6.86918 5.55996 6.55682 5.88886 6.33706C6.21776 6.1173 6.60444 6 7 6C7.53043 6 8.03914 6.21071 8.41421 6.58579C8.78929 6.96086 9 7.46957 9 8Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/stackframe-arrow-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8288 8L8.45377 13H3V3H8.45377L12.8288 8ZM8 12L11.5 8L8 4H4V12H8Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/debug/start-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.99976 14V2.18094L12.9998 8.06218L3.99976 14ZM5.49999 5L10.3145 8.06218L5.49999 11.1809L5.49999 5Z" fill="#89D185"/>
-</svg>

src/vs/workbench/browser/media/images/debug/step-into-alt1.svg

@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.8843 5.62364L10.6732 4.4125L8.50351 6.57009V0H6.78922V6.5532L4.64027 4.41232L3.42859 5.624L7.66387 9.85928L11.8843 5.62364ZM10.6726 4.81602L10.6729 4.81624L10.6726 4.816L10.6726 4.81602ZM7.66494 9.45342L7.66347 9.45482L7.66351 9.45486L7.66494 9.45342ZM8.21779 0.571429V7.25708L8.21773 7.25714V0.571429H8.21779ZM7.07487 7.24108L4.64065 4.816L4.64062 4.81603L7.07487 7.24114V7.24108Z" fill="#75BEFF"/>
-<path d="M7.65681 16C8.91917 16 9.94252 14.9766 9.94252 13.7143C9.94252 12.4519 8.91917 11.4286 7.65681 11.4286C6.39444 11.4286 5.37109 12.4519 5.37109 13.7143C5.37109 14.9766 6.39444 16 7.65681 16Z" fill="#75BEFF"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>

src/vs/workbench/browser/media/images/debug/step-out-alt1.svg

@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.8843 4.23565L10.6732 5.44678L8.50351 3.28919V9.85928H6.78922V3.30609L4.64027 5.44697L3.42859 4.23528L7.66387 2.86102e-06L11.8843 4.23565ZM10.6726 5.04326L10.6729 5.04304L10.6726 5.04328L10.6726 5.04326ZM7.66494 0.405865L7.66347 0.40446L7.66351 0.404428L7.66494 0.405865ZM8.21779 9.28785V2.60221L8.21773 2.60215V9.28785H8.21779ZM7.07487 2.6182L4.64065 5.04328L4.64062 5.04326L7.07487 2.61815V2.6182Z" fill="#75BEFF"/>
-<path d="M7.65681 16C8.91917 16 9.94252 14.9766 9.94252 13.7143C9.94252 12.4519 8.91917 11.4286 7.65681 11.4286C6.39444 11.4286 5.37109 12.4519 5.37109 13.7143C5.37109 14.9766 6.39444 16 7.65681 16Z" fill="#75BEFF"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>

src/vs/workbench/browser/media/images/debug/step-over-alt1.svg

@@ -1,9 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C9.10457 14 10 13.1046 10 12C10 10.8954 9.10457 10 8 10C6.89543 10 6 10.8954 6 12C6 13.1046 6.89543 14 8 14Z" fill="#75BEFF"/>
-<mask id="path-2-outside-1" maskUnits="userSpaceOnUse" x="1" y="1" width="14" height="7" fill="black">
-<rect fill="white" x="1" y="1" width="14" height="7"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13 2H14V6H14.0035V7H14H13.7558H13H12.7358H9.37988V6H12.3843C11.6045 4.4259 9.89397 3.33334 7.90917 3.33334C5.34 3.33334 3.23028 5.16396 3.00407 7.5H2C2.2275 4.55454 4.84849 2.33334 7.90917 2.33334C10.0379 2.33334 11.954 3.40785 13 5.0532V2Z"/>
-</mask>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13 2H14V6H14.0035V7H14H13.7558H13H12.7358H9.37988V6H12.3843C11.6045 4.4259 9.89397 3.33334 7.90917 3.33334C5.34 3.33334 3.23028 5.16396 3.00407 7.5H2C2.2275 4.55454 4.84849 2.33334 7.90917 2.33334C10.0379 2.33334 11.954 3.40785 13 5.0532V2Z" fill="#75BEFF"/>
-<path d="M14 2H14.25V1.75H14V2ZM13 2V1.75H12.75V2H13ZM14 6H13.75V6.25H14V6ZM14.0035 6H14.2535V5.75H14.0035V6ZM14.0035 7V7.25H14.2535V7H14.0035ZM9.37988 7H9.12988V7.25H9.37988V7ZM9.37988 6V5.75H9.12988V6H9.37988ZM12.3843 6V6.25H12.7872L12.6083 5.88902L12.3843 6ZM3.00407 7.5V7.75H3.23103L3.2529 7.5241L3.00407 7.5ZM2 7.5L1.75074 7.48075L1.72995 7.75H2V7.5ZM13 5.0532L12.789 5.18732L13.25 5.91244V5.0532H13ZM14 1.75H13V2.25H14V1.75ZM14.25 6V2H13.75V6H14.25ZM14.0035 5.75H14V6.25H14.0035V5.75ZM14.2535 7V6H13.7535V7H14.2535ZM14 7.25H14.0035V6.75H14V7.25ZM13.7558 7.25H14V6.75H13.7558V7.25ZM13 7.25H13.7558V6.75H13V7.25ZM12.7358 7.25H13V6.75H12.7358V7.25ZM9.37988 7.25H12.7358V6.75H9.37988V7.25ZM9.12988 6V7H9.62988V6H9.12988ZM12.3843 5.75H9.37988V6.25H12.3843V5.75ZM7.90917 3.58334C9.80263 3.58334 11.4243 4.62529 12.1603 6.11098L12.6083 5.88902C11.7848 4.22651 9.9853 3.08334 7.90917 3.08334V3.58334ZM3.2529 7.5241C3.46544 5.32932 5.45512 3.58334 7.90917 3.58334V3.08334C5.22488 3.08334 2.99513 4.99861 2.75523 7.4759L3.2529 7.5241ZM2 7.75H3.00407V7.25H2V7.75ZM7.90917 2.08334C4.73318 2.08334 1.98944 4.39036 1.75074 7.48075L2.24926 7.51925C2.46556 4.71873 4.96379 2.58334 7.90917 2.58334V2.08334ZM13.211 4.91908C12.1179 3.19966 10.1212 2.08334 7.90917 2.08334V2.58334C9.9547 2.58334 11.7901 3.61604 12.789 5.18732L13.211 4.91908ZM12.75 2V5.0532H13.25V2H12.75Z" fill="#75BEFF" mask="url(#path-2-outside-1)"/>
-</svg>

src/vs/workbench/browser/media/images/debug/stop-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.5 3.5H3.5V12.5H12.5V3.5ZM2 2V14H14V2H2Z" fill="#F48771"/>
-</svg>

src/vs/workbench/browser/media/images/editor/open-change-alt1.svg

@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5081 13.915C13.3437 13.915 14.0211 13.2376 14.0211 12.402C14.0211 11.5664 13.3437 10.889 12.5081 10.889C11.6725 10.889 10.9951 11.5664 10.9951 12.402C10.9951 13.2376 11.6725 13.915 12.5081 13.915Z" stroke="white" stroke-miterlimit="10"/>
-<path d="M12.517 11.043V4.672C12.5171 4.51814 12.4869 4.36576 12.4281 4.22357C12.3693 4.08138 12.2831 3.95217 12.1743 3.84333C12.0656 3.73449 11.9365 3.64814 11.7943 3.58923C11.6522 3.53032 11.4998 3.5 11.346 3.5H7.79297" stroke="white" stroke-miterlimit="10"/>
-<path d="M9.47911 5.691L7.36011 3.501L9.53211 1.34" stroke="white" stroke-linejoin="bevel"/>
-<path d="M3.51202 5.09C4.34763 5.09 5.02502 4.4126 5.02502 3.577C5.02502 2.74139 4.34763 2.064 3.51202 2.064C2.67642 2.064 1.99902 2.74139 1.99902 3.577C1.99902 4.4126 2.67642 5.09 3.51202 5.09Z" stroke="white" stroke-miterlimit="10"/>
-<path d="M3.5 4.936V11.307C3.5 11.6176 3.62337 11.9154 3.84298 12.135C4.06258 12.3546 4.36043 12.478 4.671 12.478H8.227" stroke="white" stroke-miterlimit="10"/>
-<path d="M6.54104 10.287L8.66004 12.478L6.48804 14.638" stroke="white" stroke-linejoin="bevel"/>
-</svg>

src/vs/workbench/browser/media/images/editor/split-horizontal-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 1L15 1V14H2V13L2 4V3V1ZM3 2V13H14V2H8.5H3Z" fill="white"/>
-<rect x="8" y="2" width="1" height="11" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/editor/split-vertical-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 1H15V14H2V13L2 4V3V1ZM3 2V13H14V2H8H3Z" fill="white"/>
-<path d="M3 7H15V8H3V7Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/explorer/add-file-alt1.svg

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 1.69995V4.99995H13.5V4.19995L10.8 1.69995H10Z" fill="white"/>
-<path d="M6 3H4V1H3V3H1V4H3V6H4V4H6V3Z" fill="white"/>
-<path d="M13.9 3.6L11.1 1.1L10.8 1H5V2H10.6L13 4.1V13H4V7H3V13.5L3.5 14H9H13.5L14 13.5V4L13.9 3.6Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/explorer/add-folder-alt1.svg

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.5 8H3V7H6.3L7.1 6.1L7.5 6H14V7H7.7L6.9 7.9L6.5 8Z" fill="white"/>
-<path d="M6 3H4V1H3V3H1V4H3V6H4V4H6V3Z" fill="white"/>
-<path d="M14.5 4H8.2L7.4 3.1L7.1 3H7V4.1L7.6 4.9L8 5H14V13H3V7H2V13.5L2.5 14H14.5L15 13.5V4.5L14.5 4Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/explorer/close-alt1.svg

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13 3H6V5H11V10H13V3ZM11 11H14V2H5V5H2V14H11V11ZM10 11V10V6H6H5H3V13H10V11Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.24444 11.8258L4.17419 7.7555L4.92969 7L8.99994 11.0703L8.24444 11.8258Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.82569 7.7555L4.75544 11.8258L3.99994 11.0703L8.07019 7L8.82569 7.7555Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/explorer/collapse-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13 3H6V5H11V10H13V3ZM11 11H14V2H5V5H2V14H11V11ZM10 11V10V6H6H5H3V13H10V11Z" fill="white"/>
-<path d="M9 9H4V10H9V9Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/explorer/layout-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15 6.49999L14.5302 5.99999H7V1.4698L6.5302 1H1.4698L1 1.4698V9.53019L1.4698 9.99999H4V14.5302L4.4698 15H14.5302L15 14.5302V6.49999ZM2 8.99999V3H6V8.99999H2ZM14 14H5V9.99999H6.5302L7 9.53019V8.01341H14V14Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/explorer/more-alt1.svg

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 8C4 8.19778 3.94135 8.39112 3.83147 8.55557C3.72159 8.72002 3.56541 8.84819 3.38268 8.92388C3.19996 8.99957 2.99889 9.01937 2.80491 8.98079C2.61093 8.9422 2.43275 8.84696 2.29289 8.70711C2.15304 8.56725 2.0578 8.38907 2.01922 8.19509C1.98063 8.00111 2.00043 7.80004 2.07612 7.61732C2.15181 7.43459 2.27998 7.27841 2.44443 7.16853C2.60888 7.05865 2.80222 7 3 7C3.26522 7 3.51957 7.10536 3.70711 7.29289C3.89464 7.48043 4 7.73478 4 8Z" fill="white"/>
-<path d="M9 8C9 8.19778 8.94135 8.39112 8.83147 8.55557C8.72159 8.72002 8.56541 8.84819 8.38268 8.92388C8.19996 8.99957 7.99889 9.01937 7.80491 8.98079C7.61093 8.9422 7.43275 8.84696 7.29289 8.70711C7.15304 8.56725 7.0578 8.38907 7.01922 8.19509C6.98063 8.00111 7.00043 7.80004 7.07612 7.61732C7.15181 7.43459 7.27998 7.27841 7.44443 7.16853C7.60888 7.05865 7.80222 7 8 7C8.26522 7 8.51957 7.10536 8.70711 7.29289C8.89464 7.48043 9 7.73478 9 8Z" fill="white"/>
-<path d="M14 8C14 8.19778 13.9414 8.39112 13.8315 8.55557C13.7216 8.72002 13.5654 8.84819 13.3827 8.92388C13.2 8.99957 12.9989 9.01937 12.8049 8.98079C12.6109 8.9422 12.4327 8.84696 12.2929 8.70711C12.153 8.56725 12.0578 8.38907 12.0192 8.19509C11.9806 8.00111 12.0004 7.80004 12.0761 7.61732C12.1518 7.43459 12.28 7.27841 12.4444 7.16853C12.6089 7.05865 12.8022 7 13 7C13.2652 7 13.5196 7.10536 13.7071 7.29289C13.8946 7.48043 14 7.73478 14 8Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/explorer/refresh-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.6822 3H2V2H6V6H5V3.99963C3.78555 4.91184 3 6.36418 3 8C3 10.7614 5.23858 13 8 13C10.7614 13 13 10.7614 13 8C13 5.77211 11.5429 3.88455 9.52968 3.23832L9.83199 2.28483C12.2497 3.0592 14 5.3252 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8C2 5.91303 3.06551 4.07492 4.6822 3Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/explorer/save-alt1.svg

@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15 3V11.5L14.5 12H11.985V11H14V3.206L12.793 2H4.985V4H3.985V1.5L4.485 1H13L13.353 1.147L14.853 2.647L15 3Z" fill="white"/>
-<path d="M11.853 5.646L10.353 4.146L10 4H1.5L1 4.5V14.5L1.5 15H11.5L12 14.5V6L11.853 5.646ZM11 14H2V5H9.793L11 6.208V14Z" fill="white"/>
-<path d="M10 9.5V14H9V10H4V14H3V9.5L3.5 9H9.5L10 9.5Z" fill="white"/>
-<path d="M9 4.5V8H4V4.5H7V7H8V4.5H9Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/extensions/clear-alt1.svg

@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.70002 12.6L10.4 13.3L12 11.7L13.6 13.3L14.4 12.6L12.7 11L14.4 9.40005L13.6 8.60005L12 10.3L10.4 8.60005L9.70002 9.40005L11.3 11L9.70002 12.6Z" fill="white"/>
-<path d="M1 4L14 4L14 3L1 3L1 4Z" fill="white"/>
-<path d="M1 7L14 7L14 6L1 6L1 7Z" fill="white"/>
-<path d="M8.30002 9.4L8.60002 9L1.00002 9L1.00002 10L8.90002 10L8.30002 9.4Z" fill="white"/>
-<path d="M8.70002 13L8.30002 12.6L8.90002 12L1.00002 12L1.00002 13L8.70002 13Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/extensions/download-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.01509 12.072V7H8.02123V12.122L6.99145 11.085L6.28796 11.792L7.79073 13.304L8.54211 14.06L9.2446 13.353L10.7484 11.84L9.99698 11.084L9.01509 12.072Z" fill="white"/>
-<path d="M12.0064 6H11.9566C11.8485 5.24923 11.4993 4.55418 10.9618 4.02014C10.4242 3.4861 9.72768 3.14217 8.9776 3.04044C8.22753 2.9387 7.4648 3.08472 6.80496 3.45635C6.14511 3.82799 5.6241 4.40501 5.32083 5.1C4.83984 4.98232 4.33938 4.96847 3.85264 5.05937C3.36591 5.15027 2.90402 5.34385 2.49762 5.62727C2.09121 5.91068 1.74959 6.27745 1.4954 6.70326C1.24121 7.12906 1.08026 7.60415 1.02324 8.09704C0.966217 8.58992 1.01442 9.08932 1.16465 9.56211C1.31488 10.0349 1.5637 10.4703 1.89461 10.8394C2.22553 11.2084 2.63096 11.5028 3.08403 11.7029C3.5371 11.903 4.02745 12.0043 4.52255 12H5.02148V11H4.52255C3.86093 11 3.22641 10.7366 2.75858 10.2678C2.29075 9.79893 2.02792 9.16304 2.02792 8.5C2.02792 7.83696 2.29075 7.20108 2.75858 6.73224C3.22641 6.2634 3.86093 6 4.52255 6C4.71364 6.0025 4.90382 6.02699 5.08933 6.073L5.89759 6.262L6.23087 5.5C6.44573 5.00173 6.81728 4.58754 7.28889 4.3206C7.7605 4.05365 8.30629 3.94859 8.84303 4.02143C9.37977 4.09427 9.87801 4.34103 10.2618 4.72407C10.6456 5.10711 10.8938 5.60541 10.9687 6.143L11.0924 7H12.0064C12.5357 7 13.0434 7.21072 13.4176 7.58579C13.7919 7.96086 14.0021 8.46957 14.0021 9C14.0021 9.53044 13.7919 10.0391 13.4176 10.4142C13.0434 10.7893 12.5357 11 12.0064 11V12C12.8004 12 13.5618 11.6839 14.1232 11.1213C14.6846 10.5587 15 9.79565 15 9C15 8.20435 14.6846 7.44129 14.1232 6.87868C13.5618 6.31607 12.8004 6 12.0064 6Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/extensions/gear-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.10564 3.42309L6.59373 1H9.40633L9.89442 3.42309L11.9663 2.05164L13.9409 4.0122L12.5596 6.06938L15.0001 6.554V9.34663L12.5596 9.83125L13.9409 11.8884L11.9663 13.849L9.91208 12.4892L9.40633 15H6.59373L6.10564 12.5769L4.03374 13.9484L2.05916 11.9878L3.45077 9.91521L1 9.3312V6.554L3.44042 6.06938L2.05916 4.0122L4.03374 2.05164L6.10564 3.42309ZM8.5954 1.98215H7.40466L6.92747 4.35115L6.12544 4.6166L4.15978 3.31546L3.33203 4.13734L4.64247 6.08904L4.37512 6.88537L1.98918 7.35917V8.55688L4.37907 9.12638L4.64247 9.91096L3.33203 11.8627L4.15978 12.6845L6.12544 11.3834L6.92747 11.6488L7.40466 14.0178H8.5954L9.05648 11.7288L9.80154 11.2357L11.8403 12.5852L12.668 11.7633L11.3576 9.81159L11.6249 9.01526L14.0109 8.54146V7.35917L11.6249 6.88537L11.3576 6.08904L12.668 4.13734L11.8403 3.31546L9.87462 4.6166L9.07259 4.35115L8.5954 1.98215Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 9C8.55228 9 9 8.55228 9 8C9 7.44772 8.55228 7 8 7C7.44772 7 7 7.44772 7 8C7 8.55228 7.44772 9 8 9ZM8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/extensions/star-empty-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.99999 2.50708L9.27955 6.7217H13.652L10.1146 9.47221L11.4215 13.7769L7.99999 11.1165L4.57847 13.7769L5.88537 9.47221L2.34802 6.7217H6.72043L7.99999 2.50708ZM7.26844 7.6229H4.9011L6.81632 9.1121L6.08477 11.5217L7.99999 10.0325L9.9152 11.5217L9.18366 9.1121L11.0989 7.6229H8.73153L7.99999 5.21332L7.26844 7.6229Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 1L9.59454 6.25211H15L10.6269 9.65247L12.2504 15L8 11.695L3.7496 15L5.37311 9.65247L1 6.25211H6.40546L8 1ZM6.72044 6.72168H2.34804L5.88539 9.4722L4.57848 13.7769L8 11.1164L11.4215 13.7769L10.1146 9.4722L13.652 6.72168H9.27956L8 2.50706L6.72044 6.72168Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/extensions/star-full-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.99999 2.50708L9.27955 6.7217H13.652L10.1146 9.47221L11.4215 13.7769L7.99999 11.1165L4.57847 13.7769L5.88537 9.47221L2.34802 6.7217H6.72043L7.99999 2.50708ZM7.26844 7.6229H4.9011L6.81632 9.1121L6.08477 11.5217L7.99999 10.0325L9.9152 11.5217L9.18366 9.1121L11.0989 7.6229H8.73153L7.99999 5.21332L7.26844 7.6229Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 1L9.59454 6.25211H15L10.6269 9.65247L12.2504 15L8 11.695L3.7496 15L5.37311 9.65247L1 6.25211H6.40546L8 1Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/extensions/star-half-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 1L6.40546 6.25211H1L5.37311 9.65247L3.7496 15L8 11.695V10.0325V5.21334V1Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/find/close-alt1.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 4L12 12" stroke="#F4F4F4" stroke-width="1.33333"/>
-<path d="M12 4L4 12" stroke="#F4F4F4" stroke-width="1.33333"/>
-</svg>

src/vs/workbench/browser/media/images/find/collapse-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.6665 12.6667L10.3332 8.00002L5.6665 3.33335" stroke="white" stroke-width="0.875" stroke-linejoin="bevel"/>
-</svg>

src/vs/workbench/browser/media/images/find/expand-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6665 5.66669L7.99984 10.3334L3.33317 5.66669" stroke="white" stroke-width="0.875" stroke-linejoin="bevel"/>
-</svg>

src/vs/workbench/browser/media/images/find/next-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14 9.5L13.293 8.79297L9.00101 13.022L9 1L8 1L7.99899 13.022L3.707 8.79297L3 9.5L8.50101 15L14 9.5Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/find/previous-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14 6.5L13.293 7.20703L9.00101 2.97803L9 15L8 15L7.99899 2.97803L3.707 7.20703L3 6.5L8.50101 1L14 6.5Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/find/replace-all-alt1.svg

@@ -1,9 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.48195 7.043L1.22095 4.774L1.92695 4.068L2.99995 5.138V3.524C2.99916 3.329 3.03684 3.13576 3.11082 2.95533C3.18481 2.77491 3.29365 2.61085 3.43112 2.47254C3.56859 2.33424 3.73199 2.2244 3.91196 2.14932C4.09193 2.07424 4.28494 2.0354 4.47995 2.035H6.97995V3H4.47995C4.34483 3.0062 4.21734 3.0644 4.12415 3.16244C4.03096 3.26047 3.97929 3.39075 3.97995 3.526L3.98795 5.126L4.99995 4.119L5.69995 4.819L3.48195 7.043Z" fill="white"/>
-<path d="M1 8V14.979H11.021V8H1ZM10 14H2V9H10V14Z" fill="white"/>
-<path d="M5.93994 6L4.93994 7H11.9999V12V12.979H13.0209V6H5.93994Z" fill="white"/>
-<path d="M9.01702 12.915C8.74759 13.0062 8.46442 13.0502 8.18002 13.045C7.90075 13.0522 7.62397 12.9908 7.37402 12.866C7.15449 12.7534 6.9745 12.5765 6.85802 12.359C6.73538 12.1251 6.67381 11.864 6.67902 11.6C6.67391 11.3127 6.74278 11.029 6.87902 10.776C7.00881 10.5392 7.2048 10.3453 7.44302 10.218C7.70188 10.0821 7.9907 10.0134 8.28302 10.018C8.53066 10.0173 8.77737 10.0486 9.01702 10.111V10.924C8.92668 10.8708 8.82845 10.8323 8.72602 10.81C8.61378 10.7824 8.49859 10.7686 8.38302 10.769C8.27978 10.7632 8.17644 10.7784 8.0793 10.8138C7.98216 10.8492 7.89326 10.9041 7.81802 10.975C7.74723 11.0492 7.69236 11.137 7.65676 11.2331C7.62116 11.3293 7.6056 11.4316 7.61102 11.534C7.60565 11.6355 7.62127 11.7369 7.65688 11.8321C7.6925 11.9272 7.74735 12.014 7.81802 12.087C7.89213 12.1556 7.97925 12.2087 8.07424 12.2431C8.16923 12.2774 8.27015 12.2924 8.37102 12.287C8.59617 12.2843 8.81751 12.2284 9.01702 12.124V12.915Z" fill="white"/>
-<path d="M9.029 4.489L8.913 5H8L8.729 2H10.015L10.708 5H9.808L9.689 4.489H9.029ZM9.19 3.789H9.524L9.359 3.056L9.19 3.789Z" fill="white"/>
-<path d="M13.4569 5.01899H12.0239V2.01899H13.1149C13.3035 2.00994 13.4922 2.03327 13.6729 2.08799C13.8006 2.14095 13.9064 2.23583 13.9729 2.35699C14.055 2.50587 14.0958 2.67403 14.0909 2.84399C14.0972 2.97556 14.0761 3.107 14.0289 3.22999C13.9803 3.33235 13.9124 3.42436 13.8289 3.50099C13.9295 3.58106 14.0131 3.68032 14.0749 3.79299C14.1311 3.92104 14.1571 4.06029 14.1509 4.19999C14.1619 4.41417 14.0951 4.62511 13.9629 4.79399C13.9016 4.86797 13.8241 4.92677 13.7363 4.9658C13.6485 5.00483 13.5529 5.02304 13.4569 5.01899ZM12.9499 2.62399H12.9259V3.20799H12.9499C12.9872 3.2115 13.0247 3.20755 13.0605 3.19639C13.0962 3.18523 13.1293 3.16708 13.1579 3.14299C13.2062 3.08189 13.2287 3.00444 13.2209 2.92699C13.2293 2.84372 13.208 2.76016 13.1609 2.69099C13.1322 2.66597 13.0987 2.64711 13.0624 2.63558C13.0261 2.62406 12.9878 2.62011 12.9499 2.62399V2.62399ZM12.9419 3.71499H12.9259V4.35899H12.9539C12.9935 4.36305 13.0335 4.35902 13.0715 4.34716C13.1095 4.3353 13.1447 4.31585 13.1749 4.28999C13.2256 4.22194 13.2488 4.13735 13.2399 4.05299C13.2497 3.9601 13.2268 3.8667 13.1749 3.78899C13.1435 3.76099 13.1064 3.73993 13.0663 3.72718C13.0262 3.71443 12.9838 3.71028 12.9419 3.71499V3.71499Z" fill="white"/>
-<path d="M4.015 12.507L3.9 13.013H3L3.722 10.043H4.992L5.678 13.013H4.778L4.66 12.507H4.015ZM4.174 11.807H4.505L4.342 11.081L4.174 11.807Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/find/replace-alt1.svg

@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.48195 6.008L3.22095 3.739L3.92695 3.033L4.99995 4.1V2.489C4.99903 2.29396 5.03661 2.10066 5.11055 1.92018C5.18449 1.73969 5.29333 1.57558 5.43083 1.43725C5.56832 1.29892 5.73177 1.18908 5.9118 1.11405C6.09184 1.03902 6.28491 1.00026 6.47995 1H8.97995V1.965H6.47995C6.34474 1.97095 6.21711 2.02908 6.12387 2.12716C6.03063 2.22525 5.97904 2.35567 5.97995 2.491L5.98795 4.091L6.99995 3.084L7.69995 3.784L5.48195 6.008Z" fill="white"/>
-<path d="M3 7V14.979H12.021V7H3ZM11 14H4V8H11V14Z" fill="white"/>
-<path d="M9.10745 12.8719C8.7495 12.9932 8.37331 13.0517 7.99545 13.0449C7.62432 13.0548 7.25648 12.973 6.92445 12.8069C6.63249 12.6574 6.39316 12.4222 6.23845 12.1329C6.07539 11.822 5.99353 11.475 6.00045 11.1239C5.99274 10.7405 6.08437 10.3615 6.26645 10.0239C6.43891 9.70923 6.69913 9.45144 7.01545 9.28194C7.3597 9.10143 7.7438 9.0103 8.13245 9.01694C8.46139 9.01575 8.78911 9.05709 9.10745 9.13994V10.2259C8.98739 10.1549 8.85673 10.1036 8.72045 10.0739C8.57154 10.0375 8.41875 10.0194 8.26545 10.0199C8.05874 10.0006 7.8515 10.0509 7.67653 10.1626C7.50156 10.2744 7.36887 10.4413 7.29945 10.6369C7.25205 10.7647 7.23162 10.9009 7.23945 11.0369C7.23133 11.173 7.25177 11.3093 7.29945 11.4369C7.34421 11.5642 7.41749 11.6796 7.51368 11.7742C7.60988 11.8689 7.72644 11.9403 7.85445 11.9829C7.98233 12.0298 8.11854 12.0495 8.25445 12.0409C8.55346 12.0375 8.84743 11.9635 9.11245 11.8249L9.10745 12.8719Z" fill="white"/>
-<path d="M11.9 5.00001H10V1.02001H11.447C11.697 1.00802 11.9473 1.0388 12.187 1.11101C12.3574 1.18046 12.4987 1.30654 12.587 1.46801C12.6959 1.66553 12.7501 1.88854 12.744 2.11401C12.752 2.28849 12.7241 2.46276 12.662 2.62601C12.5972 2.76191 12.5069 2.88411 12.396 2.98601C12.5299 3.09172 12.6411 3.22334 12.723 3.37301C12.7969 3.54309 12.8311 3.72776 12.823 3.91301C12.8373 4.19722 12.7485 4.47704 12.573 4.70101C12.4919 4.79981 12.3887 4.87829 12.2719 4.9302C12.1551 4.98211 12.0277 5.00602 11.9 5.00001ZM11.228 1.82201H11.2V2.60001H11.231C11.2806 2.60479 11.3306 2.59935 11.378 2.58401C11.4253 2.56976 11.4692 2.54593 11.507 2.51401C11.5711 2.4328 11.6012 2.32994 11.591 2.22701C11.6021 2.11651 11.5737 2.00565 11.511 1.91401C11.4728 1.88094 11.4283 1.856 11.3802 1.8407C11.332 1.8254 11.2813 1.82006 11.231 1.82501L11.228 1.82201ZM11.218 3.26901H11.2V4.12401H11.237C11.2895 4.12918 11.3426 4.12374 11.393 4.10801C11.4434 4.09234 11.49 4.06647 11.53 4.03201C11.5972 3.94192 11.6279 3.82978 11.616 3.71801C11.6292 3.59487 11.5988 3.47101 11.53 3.36801C11.4884 3.3307 11.4393 3.30274 11.386 3.28601C11.3328 3.26888 11.2766 3.26309 11.221 3.26901H11.218Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/find/selection-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 11.5V10.625H9.75V11.5H1ZM1 7.125H15V8H1V7.125ZM12.375 3.625V4.5H1V3.625H12.375Z" fill="white"/>
-</svg>

src/vs/workbench/browser/media/images/git/check-alt1.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.2667 3.71009L14.4876 2.87375L9.84292 7.09793L5.19829 11.3221L1.27008 6.9945L0.423831 7.76253L5.12 12.9365L15.2667 3.71009Z" fill="white"/>
-</svg>