Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula

extensions/markdown/src/security.ts

@@ -6,7 +6,7 @@
 
 import * as vscode from 'vscode';
 
-import { getMarkdownUri, MDDocumentContentProvider } from './previewContentProvider';
+import { getMarkdownUri, MDDocumentContentProvider } from './features/previewContentProvider';
 
 import * as nls from 'vscode-nls';
 
@@ -24,14 +24,20 @@ export interface ContentSecurityPolicyArbiter {
 	setSecurityLevelForResource(resource: vscode.Uri, level: MarkdownPreviewSecurityLevel): Thenable<void>;
 
 	shouldAllowSvgsForResource(resource: vscode.Uri): void;
+
+	shouldDisableSecurityWarnings(): boolean;
+
+	setShouldDisableSecurityWarning(shouldShow: boolean): Thenable<void>;
 }
 
 export class ExtensionContentSecurityPolicyArbiter implements ContentSecurityPolicyArbiter {
 	private readonly old_trusted_workspace_key = 'trusted_preview_workspace:';
 	private readonly security_level_key = 'preview_security_level:';
+	private readonly should_disable_security_warning_key = 'preview_should_show_security_warning:';
 
 	constructor(
-		private globalState: vscode.Memento
+		private globalState: vscode.Memento,
+		private workspaceState: vscode.Memento
 	) { }
 
 	public getSecurityLevelForResource(resource: vscode.Uri): MarkdownPreviewSecurityLevel {
@@ -57,6 +63,14 @@ export class ExtensionContentSecurityPolicyArbiter implements ContentSecurityPol
 		return securityLevel === MarkdownPreviewSecurityLevel.AllowInsecureContent || securityLevel === MarkdownPreviewSecurityLevel.AllowScriptsAndAllContent;
 	}
 
+	public shouldDisableSecurityWarnings(): boolean {
+		return this.workspaceState.get<boolean>(this.should_disable_security_warning_key, false);
+	}
+
+	public setShouldDisableSecurityWarning(disabled: boolean): Thenable<void> {
+		return this.workspaceState.update(this.should_disable_security_warning_key, disabled);
+	}
+
 	private getRoot(resource: vscode.Uri): vscode.Uri {
 		if (vscode.workspace.workspaceFolders) {
 			const folderForResource = vscode.workspace.getWorkspaceFolder(resource);
@@ -82,7 +96,7 @@ export class PreviewSecuritySelector {
 
 	public async showSecutitySelectorForResource(resource: vscode.Uri): Promise<void> {
 		interface PreviewSecurityPickItem extends vscode.QuickPickItem {
-			type: 'moreinfo' | MarkdownPreviewSecurityLevel;
+			type: 'moreinfo' | 'toggle' | MarkdownPreviewSecurityLevel;
 		}
 
 		function markActiveWhen(when: boolean): string {
@@ -108,7 +122,13 @@ export class PreviewSecuritySelector {
 					type: 'moreinfo',
 					label: localize('moreInfo.title', 'More Information'),
 					description: ''
-				}
+				}, {
+					type: 'toggle',
+					label: this.cspArbiter.shouldDisableSecurityWarnings()
+						? localize('enableSecurityWarning.title', "Enable preview security warnings in this workspace")
+						: localize('disableSecurityWarning.title', "Disable preview security warning in this workspace"),
+					description: localize('toggleSecurityWarning.description', 'Does not effect the content security level')
+				},
 			], {
 				placeHolder: localize(
 					'preview.showPreviewSecuritySelector.title',
@@ -124,9 +144,14 @@ export class PreviewSecuritySelector {
 			return;
 		}
 
-		await this.cspArbiter.setSecurityLevelForResource(resource, selection.type);
-
 		const sourceUri = getMarkdownUri(resource);
+		if (selection.type === 'toggle') {
+			this.cspArbiter.setShouldDisableSecurityWarning(!this.cspArbiter.shouldDisableSecurityWarnings());
+			this.contentProvider.update(sourceUri);
+			return;
+		}
+
+		await this.cspArbiter.setSecurityLevelForResource(resource, selection.type);
 
 		await vscode.commands.executeCommand('_workbench.htmlPreview.updateOptions',
 			sourceUri,