diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 32516451074..660e9f58a1e 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -265,10 +265,10 @@ export class CommandCenter {
 
 		if (!url) {
 			/* __GDPR__
-			   "clone" : {
-				  "outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"clone" : {
+					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
 			return;
 		}
@@ -284,10 +284,10 @@ export class CommandCenter {
 
 		if (!parentPath) {
 			/* __GDPR__
-			   "clone" : {
-				  "outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"clone" : {
+					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
 			return;
 		}
@@ -306,11 +306,11 @@ export class CommandCenter {
 
 			const openFolder = result === open;
 			/* __GDPR__
-			   "clone" : {
-				  "outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
-			   }
-			 */
+				"clone" : {
+					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
+				}
+			*/
 			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
 			if (openFolder) {
 				commands.executeCommand('vscode.openFolder', Uri.file(repositoryPath));
@@ -318,17 +318,17 @@ export class CommandCenter {
 		} catch (err) {
 			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
 				/* __GDPR__
-				   "clone" : {
-					  "outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"clone" : {
+						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
 			} else {
 				/* __GDPR__
-				   "clone" : {
-					  "outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"clone" : {
+						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
 			}
 			throw err;
@@ -1342,10 +1342,10 @@ export class CommandCenter {
 			}
 
 			/* __GDPR__
-			   "git.command" : {
-				  "command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"git.command" : {
+					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });
 
 			return result.catch(async err => {
diff --git a/extensions/markdown/src/extension.ts b/extensions/markdown/src/extension.ts
index 7d7a3a8ae27..c34f12e44b8 100644
--- a/extensions/markdown/src/extension.ts
+++ b/extensions/markdown/src/extension.ts
@@ -261,11 +261,11 @@ function showPreview(cspArbiter: ExtensionContentSecurityPolicyArbiter, uri?: vs
 
 	if (telemetryReporter) {
 		/* __GDPR__
-		   "openPreview" : {
-			  "where" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "how": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"openPreview" : {
+				"where" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"how": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		telemetryReporter.sendTelemetryEvent('openPreview', {
 			where: sideBySide ? 'sideBySide' : 'inPlace',
 			how: (uri instanceof vscode.Uri) ? 'action' : 'pallete'
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts
index edee7f5d633..bd5936aa22c 100644
--- a/extensions/typescript/src/typescriptServiceClient.ts
+++ b/extensions/typescript/src/typescriptServiceClient.ts
@@ -387,10 +387,10 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 						this.error('Starting TSServer failed with error.', err);
 						window.showErrorMessage(localize('serverCouldNotBeStarted', 'TypeScript language server couldn\'t be started. Error message is: {0}', err.message || err));
 						/* __GDPR__
-						   "error" : {
-							  "message": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" }
-						   }
-						 */
+							"error" : {
+								"message": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" }
+							}
+						*/
 						this.logTelemetry('error', { message: err.message });
 						return;
 					}
@@ -402,8 +402,8 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 							this.error(`TSServer log file: ${this.tsServerLogFile}`);
 						}
 						/* __GDPR__
-						   "tsserver.error" : {}
-						 */
+							"tsserver.error" : {}
+						*/
 						this.logTelemetry('tsserver.error');
 						this.serviceExited(false);
 					});
@@ -413,10 +413,10 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 						} else {
 							this.error(`TSServer exited with code: ${code}`);
 							/* __GDPR__
-							   "tsserver.exitWithCode" : {
-								  "code" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-							   }
-							 */
+								"tsserver.exitWithCode" : {
+									"code" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+								}
+							*/
 							this.logTelemetry('tsserver.exitWithCode', { code: code });
 						}
 
@@ -562,8 +562,8 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 							isCloseAffordance: true
 						});
 					/* __GDPR__
-					   "serviceExited" : {}
-					 */
+						"serviceExited" : {}
+					*/
 					this.logTelemetry('serviceExited');
 				} else if (diff < 60 * 1000 /* 1 Minutes */) {
 					this.lastStart = Date.now();
@@ -852,12 +852,12 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 				break;
 		}
 		/* __GDPR__
-		   "typingsInstalled" : {
-			  "installedPackages" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-			  "installSuccess": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "typingsInstallerVersion": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-		   }
-		 */
+			"typingsInstalled" : {
+				"installedPackages" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+				"installSuccess": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"typingsInstallerVersion": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+			}
+		*/
 		// __GDPR__COMMENT__: Other events are defined by TypeScript.
 		this.logTelemetry(telemetryData.telemetryEventName, properties);
 	}
diff --git a/extensions/typescript/src/utils/projectStatus.ts b/extensions/typescript/src/utils/projectStatus.ts
index 7bb8416e33a..ef95074e01b 100644
--- a/extensions/typescript/src/utils/projectStatus.ts
+++ b/extensions/typescript/src/utils/projectStatus.ts
@@ -55,8 +55,8 @@ class ExcludeHintItem {
 		this._item.color = '#A5DF3B';
 		this._item.show();
 		/* __GDPR__
-		   "js.hintProjectExcludes" : {}
-		 */
+			"js.hintProjectExcludes" : {}
+		*/
 		this._client.logTelemetry('js.hintProjectExcludes');
 	}
 }
diff --git a/src/typings/native-keymap.d.ts b/src/typings/native-keymap.d.ts
index 8f5162ab951..716a74e38b8 100644
--- a/src/typings/native-keymap.d.ts
+++ b/src/typings/native-keymap.d.ts
@@ -43,12 +43,12 @@ declare module 'native-keymap' {
 	export function getKeyMap(): IKeyboardMapping;
 
 	/* __GDPR__FRAGMENT__
-	   "IKeyboardLayoutInfo" : {
-		  "name" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "id": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "text": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	   }
-	 */
+		"IKeyboardLayoutInfo" : {
+			"name" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"id": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"text": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		}
+	*/
 	export interface IWindowsKeyboardLayoutInfo {
 		name: string;
 		id: string;
@@ -56,14 +56,14 @@ declare module 'native-keymap' {
 	}
 
 	/* __GDPR__FRAGMENT__
-	   "IKeyboardLayoutInfo" : {
-		  "model" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "layout": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "variant": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "options": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "rules": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	   }
-	 */
+		"IKeyboardLayoutInfo" : {
+			"model" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"layout": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"variant": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"options": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"rules": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		}
+	*/
 	export interface ILinuxKeyboardLayoutInfo {
 		model: string;
 		layout: string;
@@ -73,11 +73,11 @@ declare module 'native-keymap' {
 	}
 
 	/* __GDPR__FRAGMENT__
-	   "IKeyboardLayoutInfo" : {
-		  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "lang": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	   }
-	 */
+		"IKeyboardLayoutInfo" : {
+			"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"lang": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		}
+	*/
 	export interface IMacKeyboardLayoutInfo {
 		id: string;
 		lang: string;
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
index 4285167e656..15e75b3a9eb 100644
--- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
+++ b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
@@ -533,12 +533,12 @@ export class QuickOpenWidget implements IModelProvider {
 			const indexOfAcceptedElement = this.model.entries.indexOf(value);
 			const entriesCount = this.model.entries.length;
 			/* __GDPR__
-			   "quickOpenWidgetItemAccepted" : {
-				  "index" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "count": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "isQuickNavigate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"quickOpenWidgetItemAccepted" : {
+					"index" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"count": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"isQuickNavigate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.usageLogger.publicLog('quickOpenWidgetItemAccepted', { index: indexOfAcceptedElement, count: entriesCount, isQuickNavigate: this.quickNavigateConfiguration ? true : false });
 		}
 
@@ -781,11 +781,11 @@ export class QuickOpenWidget implements IModelProvider {
 				const entriesCount = this.model.entries.filter(e => this.isElementVisible(this.model, e)).length;
 				if (this.usageLogger) {
 					/* __GDPR__
-					   "quickOpenWidgetCancelled" : {
-						  "count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						  "isQuickNavigate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					   }
-					 */
+						"quickOpenWidgetCancelled" : {
+							"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"isQuickNavigate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						}
+					*/
 					this.usageLogger.publicLog('quickOpenWidgetCancelled', { count: entriesCount, isQuickNavigate: this.quickNavigateConfiguration ? true : false });
 				}
 			}
diff --git a/src/vs/base/parts/quickopen/common/quickOpen.ts b/src/vs/base/parts/quickopen/common/quickOpen.ts
index b8f5f06a4f2..1efef91896c 100644
--- a/src/vs/base/parts/quickopen/common/quickOpen.ts
+++ b/src/vs/base/parts/quickopen/common/quickOpen.ts
@@ -7,10 +7,10 @@
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 
 /* __GDPR__FRAGMENT__
-   "IQuickNavigateConfiguration" : {
-	  "keybindings" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-   }
- */
+	"IQuickNavigateConfiguration" : {
+		"keybindings" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	}
+*/
 export interface IQuickNavigateConfiguration {
 	keybindings: ResolvedKeybinding[];
 }
diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index ddde16603a4..0accad12c78 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -1240,11 +1240,11 @@ export class CodeMenu {
 
 	private reportMenuActionTelemetry(id: string): void {
 		/* __GDPR__
-		   "workbencActionExecuted" : {
-			  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"workbencActionExecuted" : {
+				"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('workbenchActionExecuted', { id, from: telemetryFrom });
 	}
 
diff --git a/src/vs/editor/common/commonCodeEditor.ts b/src/vs/editor/common/commonCodeEditor.ts
index 8e8f3d966c7..2c38ec938d2 100644
--- a/src/vs/editor/common/commonCodeEditor.ts
+++ b/src/vs/editor/common/commonCodeEditor.ts
@@ -1005,8 +1005,8 @@ export abstract class CommonCodeEditor extends Disposable implements editorCommo
 	protected abstract _resolveDecorationOptions(typeKey: string, writable: boolean): editorCommon.IModelDecorationOptions;
 
 	/* __GDPR__FRAGMENT__
-	   "EditorTelemetryData" : {}
-	 */
+		"EditorTelemetryData" : {}
+	*/
 	public getTelemetryData(): { [key: string]: any; } {
 		return null;
 	}
diff --git a/src/vs/editor/common/editorCommonExtensions.ts b/src/vs/editor/common/editorCommonExtensions.ts
index ec7cbbb5d0b..fee9cdfbd3a 100644
--- a/src/vs/editor/common/editorCommonExtensions.ts
+++ b/src/vs/editor/common/editorCommonExtensions.ts
@@ -195,14 +195,14 @@ export abstract class EditorAction extends EditorCommand {
 
 	protected reportTelemetry(accessor: ServicesAccessor, editor: editorCommon.ICommonCodeEditor) {
 		/* __GDPR__
-		   "editorActionInvoked" : {
-			  "name" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "id": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "${include}": [
-				 "${EditorTelemetryData}"
-			  ]
-		   }
-		 */
+			"editorActionInvoked" : {
+				"name" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"id": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"${include}": [
+					"${EditorTelemetryData}"
+				]
+			}
+		*/
 		accessor.get(ITelemetryService).publicLog('editorActionInvoked', { name: this.label, id: this.id, ...editor.getTelemetryData() });
 	}
 
diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/browser/gotoError.ts
index c6d780a5bc8..8b6111b2c13 100644
--- a/src/vs/editor/contrib/gotoError/browser/gotoError.ts
+++ b/src/vs/editor/contrib/gotoError/browser/gotoError.ts
@@ -407,13 +407,13 @@ class MarkerNavigationAction extends EditorAction {
 
 		let model = controller.getOrCreateModel();
 		/* __GDPR__
-		   "zoneWidgetShown" : {
-			  "mode" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "${include}": [
-				 "${EditorTelemetryData}"
-			  ]
-		   }
-		 */
+			"zoneWidgetShown" : {
+				"mode" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"${include}": [
+					"${EditorTelemetryData}"
+				]
+			}
+		*/
 		telemetryService.publicLog('zoneWidgetShown', { mode: 'go to error', ...editor.getTelemetryData() });
 		if (model) {
 			if (this._isNext) {
diff --git a/src/vs/editor/contrib/referenceSearch/browser/referencesController.ts b/src/vs/editor/contrib/referenceSearch/browser/referencesController.ts
index e00a92c8e38..d268a392aff 100644
--- a/src/vs/editor/contrib/referenceSearch/browser/referencesController.ts
+++ b/src/vs/editor/contrib/referenceSearch/browser/referencesController.ts
@@ -162,11 +162,11 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 			this._disposables.push({
 				dispose: () => {
 					/* __GDPR__
-					   "zoneWidgetShown" : {
-						  "mode" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						  "elapsedTime": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					   }
-					 */
+						"zoneWidgetShown" : {
+							"mode" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"elapsedTime": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						}
+					*/
 					this._telemetryService.publicLog('zoneWidgetShown', {
 						mode: 'reference search',
 						elapsedTime: Date.now() - startTime
@@ -198,11 +198,11 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 		const mode = this._editor.getModel().getLanguageIdentifier().language;
 
 		/* __GDPR__
-		   "findReferences" : {
-			  "durarion" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "mode": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"findReferences" : {
+				"durarion" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"mode": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		onDone(duration => this._telemetryService.publicLog('findReferences', {
 			duration,
 			mode
diff --git a/src/vs/editor/contrib/suggest/browser/completionModel.ts b/src/vs/editor/contrib/suggest/browser/completionModel.ts
index e902cfd9697..45ca3b876a9 100644
--- a/src/vs/editor/contrib/suggest/browser/completionModel.ts
+++ b/src/vs/editor/contrib/suggest/browser/completionModel.ts
@@ -18,12 +18,12 @@ export interface ICompletionItem extends ISuggestionItem {
 
 
 /* __GDPR__FRAGMENT__
-   "ICompletionStats" : {
-	  "suggestionCount" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "snippetCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "textCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-   }
- */
+	"ICompletionStats" : {
+		"suggestionCount" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"snippetCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"textCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	}
+*/
 // __GDPR__TODO__: This is a dynamically extensible structure which can not be declared statically.
 export interface ICompletionStats {
 	suggestionCount: number;
diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts
index a7a2433e668..6ffa21fabcb 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts
@@ -198,13 +198,13 @@ export class SuggestController implements IEditorContribution {
 
 			this._alertCompletionItem(item);
 			/* __GDPR__
-			   "suggestSnippetInsert" : {
-				  "suggestionType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "${include}": [
-					 "${EditorTelemetryData}"
-				  ]
-			   }
-			 */
+				"suggestSnippetInsert" : {
+					"suggestionType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"${include}": [
+						"${EditorTelemetryData}"
+					]
+				}
+			*/
 			this._telemetryService.publicLog('suggestSnippetInsert', { ...this._editor.getTelemetryData(), suggestionType: suggestion.type });
 		}
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index bd6189984ef..6e8807a92a0 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -729,14 +729,14 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			const { stats } = this.completionModel;
 			stats['wasAutomaticallyTriggered'] = !!isAuto;
 			/* __GDPR__
-			   "suggestWidget" : {
-				  "wasAutomaticallyTriggered" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "${include}": [
-					 "${ICompletionStats}",
-					 "${EditorTelemetryData}"
-				  ]
-			   }
-			 */
+				"suggestWidget" : {
+					"wasAutomaticallyTriggered" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"${include}": [
+						"${ICompletionStats}",
+						"${EditorTelemetryData}"
+					]
+				}
+			*/
 			this.telemetryService.publicLog('suggestWidget', { ...stats, ...this.editor.getTelemetryData() });
 
 			this.focusedItem = null;
@@ -865,12 +865,12 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			}
 		}
 		/* __GDPR__
-		   "suggestWidget:toggleDetailsFocus" : {
-			  "${include}": [
-				 "${EditorTelemetryData}"
-			  ]
-		   }
-		 */
+			"suggestWidget:toggleDetailsFocus" : {
+				"${include}": [
+					"${EditorTelemetryData}"
+				]
+			}
+		*/
 		this.telemetryService.publicLog('suggestWidget:toggleDetailsFocus', this.editor.getTelemetryData());
 	}
 
@@ -886,12 +886,12 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			removeClass(this.element, 'docs-below');
 			this.editor.layoutContentWidget(this);
 			/* __GDPR__
-			   "suggestWidget:collapseDetails" : {
-				   "${include}": [
-					  "${EditorTelemetryData}"
-				   ]
-			   }
-			 */
+				"suggestWidget:collapseDetails" : {
+					"${include}": [
+						"${EditorTelemetryData}"
+					]
+				}
+			*/
 			this.telemetryService.publicLog('suggestWidget:collapseDetails', this.editor.getTelemetryData());
 		} else {
 			if (this.state !== State.Open && this.state !== State.Details) {
@@ -901,12 +901,12 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			this.updateExpandDocsSetting(true);
 			this.showDetails();
 			/* __GDPR__
-			   "suggestWidget:expandDetails" : {
-				   "${include}": [
-					  "${EditorTelemetryData}"
-				   ]
-			   }
-			 */
+				"suggestWidget:expandDetails" : {
+					"${include}": [
+						"${EditorTelemetryData}"
+					]
+				}
+			*/
 			this.telemetryService.publicLog('suggestWidget:expandDetails', this.editor.getTelemetryData());
 		}
 
diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts
index 00479364aba..dbec87d2e95 100644
--- a/src/vs/platform/contextview/browser/contextMenuHandler.ts
+++ b/src/vs/platform/contextview/browser/contextMenuHandler.ts
@@ -45,11 +45,11 @@ export class ContextMenuHandler {
 		this.toDispose.push(this.actionRunner.addListener(EventType.BEFORE_RUN, (e: any) => {
 			if (this.telemetryService) {
 				/* __GDPR__
-				   "workbenchActionExecuted" : {
-					  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"workbenchActionExecuted" : {
+						"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: 'contextMenu' });
 			}
 
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 45292d71eaa..f8684f13156 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -64,19 +64,19 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 
 
 /* __GDPR__FRAGMENT__
-   "GalleryExtensionTelemetryData" : {
-	  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "name": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "galleryId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "publisherId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-	  "publisherName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-	  "publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-	  "dependencies": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "${include}": [
-		 "${GalleryExtensionTelemetryData2}"
-	  ]
-   }
- */
+	"GalleryExtensionTelemetryData" : {
+		"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"name": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"galleryId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"publisherId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+		"publisherName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+		"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+		"dependencies": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"${include}": [
+			"${GalleryExtensionTelemetryData2}"
+		]
+	}
+*/
 export function getGalleryExtensionTelemetryData(extension: IGalleryExtension): any {
 	return {
 		id: extension.id,
diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
index 257226f03fd..7ee13df86d6 100644
--- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
@@ -264,12 +264,12 @@ function toExtension(galleryExtension: IRawGalleryExtension, extensionsGalleryUr
 			engine: getEngine(version)
 		},
 		/* __GDPR__FRAGMENT__
-		   "GalleryExtensionTelemetryData2" : {
-			  "index" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "searchText": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "querySource": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"GalleryExtensionTelemetryData2" : {
+				"index" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"searchText": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"querySource": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		telemetryData: {
 			index: ((query.pageNumber - 1) * query.pageSize) + index,
 			searchText: query.searchText,
@@ -319,11 +319,11 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		const pageSize = getOrDefault(options, o => o.pageSize, 50);
 
 		/* __GDPR__
-		   "galleryService:query" : {
-			  "type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "text": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"galleryService:query" : {
+				"type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"text": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('galleryService:query', { type, text });
 
 		let query = new Query()
@@ -440,13 +440,13 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			const data = getGalleryExtensionTelemetryData(extension);
 			const startTime = new Date().getTime();
 			/* __GDPR__
-			   "galleryService:downloadVSIX" : {
-				  "duration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "${include}": [
-					 "${GalleryExtensionTelemetryData}"
-				  ]
-			   }
-			 */
+				"galleryService:downloadVSIX" : {
+					"duration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"${include}": [
+						"${GalleryExtensionTelemetryData}"
+					]
+				}
+			*/
 			const log = (duration: number) => this.telemetryService.publicLog('galleryService:downloadVSIX', assign(data, { duration }));
 
 			return this.getAsset(extension.assets.download)
@@ -588,19 +588,19 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 
 				const message = getErrorMessage(err);
 				/* __GDPR__
-				   "galleryService:requestError" : {
-					  "url" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "cdn": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"galleryService:requestError" : {
+						"url" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"cdn": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('galleryService:requestError', { url, cdn: true, message });
 				/* __GDPR__
-				   "galleryService:cdnFallback" : {
-					  "url" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"galleryService:cdnFallback" : {
+						"url" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('galleryService:cdnFallback', { url, message });
 
 				const fallbackOptions = assign({}, options, { url: fallbackUrl });
@@ -611,12 +611,12 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 
 					const message = getErrorMessage(err);
 					/* __GDPR__
-					   "galleryService:requestError" : {
-						  "url" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						  "cdn": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						  "message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					   }
-					 */
+						"galleryService:requestError" : {
+							"url" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"cdn": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						}
+					*/
 					this.telemetryService.publicLog('galleryService:requestError', { url: fallbackUrl, cdn: false, message });
 					return TPromise.wrapError<IRequestContext>(err);
 				});
diff --git a/src/vs/platform/opener/browser/openerService.ts b/src/vs/platform/opener/browser/openerService.ts
index 9425f4a2ea4..81ce6669386 100644
--- a/src/vs/platform/opener/browser/openerService.ts
+++ b/src/vs/platform/opener/browser/openerService.ts
@@ -31,10 +31,10 @@ export class OpenerService implements IOpenerService {
 	open(resource: URI, options?: { openToSide?: boolean }): TPromise<any> {
 
 		/* __GDPR__
-		   "openerService" : {
-			  "scheme" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"openerService" : {
+				"scheme" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this._telemetryService.publicLog('openerService', { scheme: resource.scheme });
 
 		const { scheme, path, query, fragment } = resource;
diff --git a/src/vs/platform/search/common/search.ts b/src/vs/platform/search/common/search.ts
index cc86f27e2a3..bb2a8df08e4 100644
--- a/src/vs/platform/search/common/search.ts
+++ b/src/vs/platform/search/common/search.ts
@@ -71,15 +71,15 @@ export enum QueryType {
 	Text = 2
 }
 /* __GDPR__FRAGMENT__
-   "IPatternInfo" : {
-	  "pattern" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-	  "isRegExp": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "isWordMatch": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "wordSeparators": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "isMultiline": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "isCaseSensitive": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-   }
- */
+	"IPatternInfo" : {
+		"pattern" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+		"isRegExp": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"isWordMatch": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"wordSeparators": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"isMultiline": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"isCaseSensitive": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	}
+*/
 export interface IPatternInfo {
 	pattern: string;
 	isRegExp?: boolean;
diff --git a/src/vs/platform/telemetry/browser/errorTelemetry.ts b/src/vs/platform/telemetry/browser/errorTelemetry.ts
index 3d604a4034b..976335c3d81 100644
--- a/src/vs/platform/telemetry/browser/errorTelemetry.ts
+++ b/src/vs/platform/telemetry/browser/errorTelemetry.ts
@@ -144,15 +144,15 @@ export default class ErrorTelemetry {
 	private _flushBuffer(): void {
 		for (let error of this._buffer) {
 			/* __GDPR__
-			   "UnhandledError" : {
-				  "message" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "name": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "stack": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "id": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "line": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "column": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-			   }
-			 */
+			"UnhandledError" : {
+					"message" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"name": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"stack": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"id": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"line": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"column": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				}
+			*/
 			// __GDPR__TODO__ what's the complete set of properties?
 			this._telemetryService.publicLog('UnhandledError', error);
 		}
diff --git a/src/vs/platform/telemetry/common/experiments.ts b/src/vs/platform/telemetry/common/experiments.ts
index d3636665fd0..82350aa22c6 100644
--- a/src/vs/platform/telemetry/common/experiments.ts
+++ b/src/vs/platform/telemetry/common/experiments.ts
@@ -9,10 +9,10 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
 /* __GDPR__FRAGMENT__
-   "IExperiments" : {
-	  "deployToAzureQuickLink" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-   }
- */
+	"IExperiments" : {
+		"deployToAzureQuickLink" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	}
+*/
 export interface IExperiments {
 	ripgrepQuickSearch: boolean;
 }
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 826c751b7ce..0ebdb46ff38 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -66,10 +66,10 @@ export class TelemetryService implements ITelemetryService {
 			this._updateUserOptIn();
 			this._configurationService.onDidUpdateConfiguration(this._updateUserOptIn, this, this._disposables);
 			/* __GDPR__
-			   "optInStatus" : {
-				  "optIn" : { "classification": "SystemMetaData", "purpose": "BusinessInsight" }
-			   }
-			 */
+				"optInStatus" : {
+					"optIn" : { "classification": "SystemMetaData", "purpose": "BusinessInsight" }
+				}
+			*/
 			this.publicLog('optInStatus', { optIn: this._userOptIn });
 		}
 	}
diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts
index f530c77d794..a910df65983 100644
--- a/src/vs/platform/telemetry/common/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/common/telemetryUtils.ts
@@ -67,12 +67,12 @@ export function anonymize(input: string): string {
 }
 
 /* __GDPR__FRAGMENT__
-   "URIDescriptor" : {
-	  "mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "path": { "classification": "CustomerContent", "purpose": "FeatureInsight" }
-   }
- */
+	"URIDescriptor" : {
+		"mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"path": { "classification": "CustomerContent", "purpose": "FeatureInsight" }
+	}
+*/
 export interface URIDescriptor {
 	mimeType?: string;
 	ext?: string;
@@ -188,21 +188,21 @@ export function configurationTelemetry(telemetryService: ITelemetryService, conf
 	return configurationService.onDidUpdateConfiguration(event => {
 		if (event.source !== ConfigurationSource.Default) {
 			/* __GDPR__
-			   "updateConfiguration" : {
-				  "configurationSource" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "configurationKeys": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"updateConfiguration" : {
+					"configurationSource" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"configurationKeys": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			telemetryService.publicLog('updateConfiguration', {
 				configurationSource: ConfigurationSource[event.source],
 				configurationKeys: flattenKeys(event.sourceConfig)
 			});
 			/* __GDPR__
-			   "updateConfigurationValues" : {
-				  "configurationSource" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "configurationValues": { "classification": "CustomerContent", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"updateConfigurationValues" : {
+					"configurationSource" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"configurationValues": { "classification": "CustomerContent", "purpose": "FeatureInsight" }
+				}
+			*/
 			telemetryService.publicLog('updateConfigurationValues', {
 				configurationSource: ConfigurationSource[event.source],
 				configurationValues: flattenValues(event.sourceConfig, configurationValueWhitelist)
@@ -214,10 +214,10 @@ export function configurationTelemetry(telemetryService: ITelemetryService, conf
 export function lifecycleTelemetry(telemetryService: ITelemetryService, lifecycleService: ILifecycleService): IDisposable {
 	return lifecycleService.onShutdown(event => {
 		/* __GDPR__
-		   "shutdown" : {
-			  "reason" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"shutdown" : {
+				"reason" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		telemetryService.publicLog('shutdown', { reason: ShutdownReason[event] });
 	});
 }
@@ -226,10 +226,10 @@ export function keybindingsTelemetry(telemetryService: ITelemetryService, keybin
 	return keybindingService.onDidUpdateKeybindings(event => {
 		if (event.source === KeybindingSource.User && event.keybindings) {
 			/* __GDPR__
-			   "updateKeybindings" : {
-				   "bindings": { "classification": "CustomerContent", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"updateKeybindings" : {
+					"bindings": { "classification": "CustomerContent", "purpose": "FeatureInsight" }
+				}
+			*/
 			telemetryService.publicLog('updateKeybindings', {
 				bindings: event.keybindings.map(binding => ({
 					key: binding.key,
diff --git a/src/vs/platform/update/electron-main/updateService.ts b/src/vs/platform/update/electron-main/updateService.ts
index e38d809b297..70571cda7ab 100644
--- a/src/vs/platform/update/electron-main/updateService.ts
+++ b/src/vs/platform/update/electron-main/updateService.ts
@@ -165,10 +165,10 @@ export class UpdateService implements IUpdateService {
 				this._onUpdateNotAvailable.fire(explicit);
 				this.state = State.Idle;
 				/* __GDPR__
-				   "update:notAvailable" : {
-					  "explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"update:notAvailable" : {
+						"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('update:notAvailable', { explicit });
 
 			} else if (update.url) {
@@ -183,12 +183,12 @@ export class UpdateService implements IUpdateService {
 				this._onUpdateAvailable.fire({ url: update.url, version: update.version });
 				this.state = State.UpdateAvailable;
 				/* __GDPR__
-				   "update:available" : {
-					  "explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "version": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "currentVersion": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"update:available" : {
+						"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"version": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"currentVersion": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('update:available', { explicit, version: update.version, currentVersion: product.commit });
 
 			} else {
@@ -202,10 +202,10 @@ export class UpdateService implements IUpdateService {
 				this._onUpdateReady.fire(data);
 				this.state = State.UpdateDownloaded;
 				/* __GDPR__
-				   "update:downloaded" : {
-					  "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"update:downloaded" : {
+						"version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('update:downloaded', { version: update.version });
 			}
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
index 81f605b88a3..40d2943f7e6 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
@@ -141,10 +141,10 @@ export class MainThreadEditors implements MainThreadEditorsShape {
 	$tryShowEditor(id: string, position: EditorPosition): TPromise<void> {
 		// check how often this is used
 		/* __GDPR__
-		   "api.deprecated" : {
-			  "function" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"api.deprecated" : {
+				"function" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this._telemetryService.publicLog('api.deprecated', { function: 'TextEditor.show' });
 
 		let mainThreadEditor = this._documentsAndEditors.getEditor(id);
@@ -161,10 +161,10 @@ export class MainThreadEditors implements MainThreadEditorsShape {
 	$tryHideEditor(id: string): TPromise<void> {
 		// check how often this is used
 		/* __GDPR__
-		   "api.deprecated" : {
-			  "function" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"api.deprecated" : {
+				"function" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this._telemetryService.publicLog('api.deprecated', { function: 'TextEditor.hide' });
 
 		let mainThreadEditor = this._documentsAndEditors.getEditor(id);
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
index eda0befa00c..1935207a490 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -267,19 +267,19 @@ export class SaveParticipant implements ISaveParticipant {
 
 		return sequence(promiseFactory).then(() => {
 			/* __GDPR__
-			   "saveParticipantStats" : {
-				   "${wildcard}": [
-					  {
-						 "${prefix}": "Success-",
-						 "${classification}": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-					  },
-					  {
-						 "${prefix}": "Failure-",
-						 "${classification}": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-					  }
-				   ]
-			   }
-			 */
+				"saveParticipantStats" : {
+					"${wildcard}": [
+						{
+							"${prefix}": "Success-",
+							"${classification}": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+						},
+						{
+							"${prefix}": "Failure-",
+							"${classification}": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+						}
+					]
+				}
+			*/
 			this._telemetryService.publicLog('saveParticipantStats', stats);
 		});
 	}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTelemetry.ts b/src/vs/workbench/api/electron-browser/mainThreadTelemetry.ts
index af7e60b99ae..215f3b95b86 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTelemetry.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTelemetry.ts
@@ -26,10 +26,10 @@ export class MainThreadTelemetry implements MainThreadTelemetryShape {
 
 	$publicLog(eventName: string, data: any = Object.create(null)): void {
 		/* __GDPR__FRAGMENT__
-		   "MainThreadData" : {
-			  "pluginHostTelemetry" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"MainThreadData" : {
+				"pluginHostTelemetry" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		data[MainThreadTelemetry._name] = true;
 		this._telemetryService.publicLog(eventName, data);
 	}
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 6d402d24a05..1ad860d4cdc 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -146,14 +146,14 @@ export function createApiFactory(
 				}
 				this._seen.add(apiName);
 				/* __GDPR__
-				   "apiUsage" : {
-					  "name" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "extension": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "${include}": [
-						 "${MainThreadData}"
-					  ]
-				   }
-				 */
+					"apiUsage" : {
+						"name" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"extension": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"${include}": [
+							"${MainThreadData}"
+						]
+					}
+				*/
 				return mainThreadTelemetry.$publicLog('apiUsage', {
 					name: apiName,
 					extension: extension.id
@@ -504,15 +504,15 @@ export function createApiFactory(
 			},
 			createSourceControl(id: string, label: string, rootUri?: vscode.Uri) {
 				/* __GDPR__
-				   "registerSCMProvider" : {
-					  "extensionId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "providerId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-					  "providerLabel": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-					  "${include}": [
-						 "${MainThreadData}"
-					  ]
-				   }
-				 */
+					"registerSCMProvider" : {
+						"extensionId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"providerId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+						"providerLabel": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+						"${include}": [
+							"${MainThreadData}"
+						]
+					}
+				*/
 				mainThreadTelemetry.$publicLog('registerSCMProvider', {
 					extensionId: extension.id,
 					providerId: id,
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 407a5a6cd58..0cec48ba083 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -282,12 +282,12 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 	private _doActivateExtension(extensionDescription: IExtensionDescription, startup: boolean): TPromise<ActivatedExtension> {
 		let event = getTelemetryActivationEvent(extensionDescription);
 		/* __GDPR__
-		   "activatePlugin" : {
-			   "${include}": [
-				  "${TelemetryActivationEvent}"
-			   ]
-		   }
-		 */
+			"activatePlugin" : {
+				"${include}": [
+					"${TelemetryActivationEvent}"
+				]
+			}
+		*/
 		this._mainThreadTelemetry.$publicLog('activatePlugin', event);
 		if (!extensionDescription.main) {
 			// Treat the extension as being empty => NOT AN ERROR CASE
@@ -388,20 +388,20 @@ function loadCommonJSModule<T>(modulePath: string, activationTimesBuilder: Exten
 
 function getTelemetryActivationEvent(extensionDescription: IExtensionDescription): any {
 	/* __GDPR__FRAGMENT__
-	   "TelemetryActivationEvent" : {
-		   "id": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		   "name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		   "publisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		   "activationEvents": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		   "isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		   "${wildcard}": [
-			   {
-			      "${prefix}": "contribution.",
-			      "${classification}": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
+		"TelemetryActivationEvent" : {
+			"id": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+			"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+			"publisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+			"activationEvents": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"${wildcard}": [
+				{
+					"${prefix}": "contribution.",
+					"${classification}": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
 			]
-	   }
-	 */
+		}
+	*/
 	let event = {
 		id: extensionDescription.id,
 		name: extensionDescription.name,
diff --git a/src/vs/workbench/api/node/extHostTextEditor.ts b/src/vs/workbench/api/node/extHostTextEditor.ts
index dde54d0e6f2..562c99258a5 100644
--- a/src/vs/workbench/api/node/extHostTextEditor.ts
+++ b/src/vs/workbench/api/node/extHostTextEditor.ts
@@ -596,14 +596,14 @@ export class ExtHostTextEditor2 extends ExtHostTextEditor {
 						const extension = index.findSubstr(call.getFileName());
 						if (extension) {
 							/* __GDPR__
-							   "usesCommandLink" : {
-								  "extension" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-								  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-								  "${include}": [
-									 "${MainThreadData}"
-								  ]
-							   }
-							 */
+								"usesCommandLink" : {
+									"extension" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+									"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+									"${include}": [
+										"${MainThreadData}"
+									]
+								}
+							*/
 							this._mainThreadTelemetry.$publicLog('usesCommandLink', {
 								extension: extension.id,
 								from: 'decoration',
diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
index cfcb5993fe9..7631f540e6a 100644
--- a/src/vs/workbench/browser/composite.ts
+++ b/src/vs/workbench/browser/composite.ts
@@ -109,10 +109,10 @@ export abstract class Composite extends Component implements IComposite {
 			if (this._telemetryService && this._telemetryService.publicLog) {
 				const eventName: string = 'compositeOpen';
 				/* __GDPR__
-				   "compositeOpen" : {
-					  "composite" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"compositeOpen" : {
+						"composite" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this._telemetryService.publicLog(eventName, { composite: this.getId() });
 			}
 		}
@@ -127,11 +127,11 @@ export abstract class Composite extends Component implements IComposite {
 				const eventName: string = 'compositeShown';
 				this._telemetryData.composite = this.getId();
 				/* __GDPR__
-				   "compositeShown" : {
-					  "timeSpent" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-					  "composite": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"compositeShown" : {
+						"timeSpent" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+						"composite": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this._telemetryService.publicLog(eventName, this._telemetryData);
 			}
 		}
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
index acdcbc9975d..2d7e3f8dbe0 100644
--- a/src/vs/workbench/browser/parts/compositePart.ts
+++ b/src/vs/workbench/browser/parts/compositePart.ts
@@ -310,11 +310,11 @@ export abstract class CompositePart<T extends Composite> extends Part {
 				// Log in telemetry
 				if (this.telemetryService) {
 					/* __GDPR__
-					   "workbenchActionExecuted" : {
-						  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					   }
-					 */
+						"workbenchActionExecuted" : {
+							"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						}
+					*/
 					this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: this.nameForTelemetry });
 				}
 			});
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
index bc6477e0c2f..f7653de9370 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
@@ -444,8 +444,8 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 				// Log this fact in telemetry
 				if (this.telemetryService) {
 					/* __GDPR__
-					   "workbenchEditorMaximized" : {}
-					 */
+						"workbenchEditorMaximized" : {}
+					*/
 					this.telemetryService.publicLog('workbenchEditorMaximized');
 				}
 
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index c05d8b9031c..f5468b7d094 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -167,12 +167,12 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 			this.revealIfOpen = editorConfig.revealIfOpen;
 
 			/* __GDPR__
-			   "workbenchEditorConfiguration" : {
+				"workbenchEditorConfiguration" : {
 					"${include}": [
-					   "${IWorkbenchEditorConfiguration}"
+						"${IWorkbenchEditorConfiguration}"
 					]
-			   }
-			 */
+				}
+			*/
 			this.telemetryService.publicLog('workbenchEditorConfiguration', editorConfig);
 		} else {
 			this.tabOptions = {
@@ -256,23 +256,23 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 	private onEditorOpened(identifier: EditorIdentifier): void {
 		/* __GDPR__
-		   "editorOpened" : {
-			   "${include}": [
-				  "${EditorTelemetryDescriptor}"
-			   ]
-		   }
-		 */
+			"editorOpened" : {
+				"${include}": [
+					"${EditorTelemetryDescriptor}"
+				]
+			}
+		*/
 		this.telemetryService.publicLog('editorOpened', identifier.editor.getTelemetryDescriptor());
 	}
 
 	private onEditorClosed(event: EditorCloseEvent): void {
 		/* __GDPR__
-		   "editorClosed" : {
-			   "${include}": [
-				  "${EditorTelemetryDescriptor}"
-			   ]
-		   }
-		 */
+			"editorClosed" : {
+				"${include}": [
+					"${EditorTelemetryDescriptor}"
+				]
+			}
+		*/
 		this.telemetryService.publicLog('editorClosed', event.editor.getTelemetryDescriptor());
 	}
 
@@ -341,10 +341,10 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		// Opened to the side
 		if (position !== Position.ONE) {
 			/* __GDPR__
-			   "workbenchSideEditorOpened" : {
-				  "position" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"workbenchSideEditorOpened" : {
+					"position" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('workbenchSideEditorOpened', { position: position });
 		}
 
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index 4cb58efa3c6..8f78fd0e943 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -260,11 +260,11 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 			// Log in telemetry
 			if (this.telemetryService) {
 				/* __GDPR__
-				   "workbenchActionExecuted" : {
-					  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"workbenchActionExecuted" : {
+						"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: 'editorPart' });
 			}
 		}));
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index ccc519931c9..c506cc51e44 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -553,11 +553,11 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		const handlerDescriptor = registry.getQuickOpenHandler(prefix) || registry.getDefaultQuickOpenHandler();
 
 		/* __GDPR__
-		   "quickOpenWidgetShown" : {
-			  "mode" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "quickNavigate": { "${inline}": [ "${IQuickNavigateConfiguration}" ] }
-		   }
-		 */
+			"quickOpenWidgetShown" : {
+				"mode" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"quickNavigate": { "${inline}": [ "${IQuickNavigateConfiguration}" ] }
+			}
+		*/
 		this.telemetryService.publicLog('quickOpenWidgetShown', { mode: handlerDescriptor.getId(), quickNavigate: quickNavigateConfiguration });
 
 		// Trigger onOpen
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index de1e639aeeb..72bfb28604c 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -294,11 +294,11 @@ class StatusBarEntryItem implements IStatusbarItem {
 
 			if (action.enabled) {
 				/* __GDPR__
-				   "workbenchActionExecuted" : {
-					  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"workbenchActionExecuted" : {
+						"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'status bar' });
 				(action.run() || TPromise.as(null)).done(() => {
 					action.dispose();
diff --git a/src/vs/workbench/common/actions.ts b/src/vs/workbench/common/actions.ts
index b8557349a2b..1bd3ba72aa6 100644
--- a/src/vs/workbench/common/actions.ts
+++ b/src/vs/workbench/common/actions.ts
@@ -171,11 +171,11 @@ function triggerAndDisposeAction(instantitationService: IInstantiationService, t
 	const from = args && args.from || 'keybinding';
 	if (telemetryService) {
 		/* __GDPR__
-		   "workbenchActionExecuted" : {
-			  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"workbenchActionExecuted" : {
+				"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		telemetryService.publicLog('workbenchActionExecuted', { id: actionInstance.id, from });
 	}
 
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index 3674332592e..72b481737f9 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -204,10 +204,10 @@ export abstract class EditorInput implements IEditorInput {
 	 */
 	public getTelemetryDescriptor(): object {
 		/* __GDPR__FRAGMENT__
-		   "EditorTelemetryDescriptor" : {
-			  "typeId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"EditorTelemetryDescriptor" : {
+				"typeId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		return { typeId: this.getTypeId() };
 	}
 
@@ -798,18 +798,18 @@ export const EditorOpenPositioning = {
 
 export interface IWorkbenchEditorConfiguration {
 	/* __GDPR__FRAGMENT__
-	   "IWorkbenchEditorConfiguration" : {
-		  "showTabs" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "tabCloseButton": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "showIcons": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "enablePreview": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "enablePreviewFromQuickOpen": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "closeOnFileDelete": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "openPositioning": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "revealIfOpen": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "swipeToNavigate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	   }
-	 */
+		"IWorkbenchEditorConfiguration" : {
+			"showTabs" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"tabCloseButton": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"showIcons": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"enablePreview": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"enablePreviewFromQuickOpen": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"closeOnFileDelete": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"openPositioning": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"revealIfOpen": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"swipeToNavigate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		}
+	*/
 	workbench: {
 		editor: {
 			showTabs: boolean;
diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts
index 6c20c0296d8..ea19725e484 100644
--- a/src/vs/workbench/common/editor/resourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/resourceEditorInput.ts
@@ -73,10 +73,10 @@ export class ResourceEditorInput extends EditorInput {
 		descriptor['resource'] = telemetryURIDescriptor(this.resource);
 
 		/* __GDPR__FRAGMENT__
-		   "EditorTelemetryDescriptor" : {
-			  "resource": { "${inline}": [ "${URIDescriptor}" ] }
-		   }
-		 */
+			"EditorTelemetryDescriptor" : {
+				"resource": { "${inline}": [ "${URIDescriptor}" ] }
+			}
+		*/
 		return descriptor;
 	}
 
diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts
index cf27893825f..8057bef0160 100644
--- a/src/vs/workbench/common/editor/untitledEditorInput.ts
+++ b/src/vs/workbench/common/editor/untitledEditorInput.ts
@@ -255,10 +255,10 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		descriptor['resource'] = telemetryURIDescriptor(this.getResource());
 
 		/* __GDPR__FRAGMENT__
-		   "EditorTelemetryDescriptor" : {
-			  "resource": { "${inline}": [ "${URIDescriptor}" ] }
-		   }
-		 */
+			"EditorTelemetryDescriptor" : {
+				"resource": { "${inline}": [ "${URIDescriptor}" ] }
+			}
+		*/
 		return descriptor;
 	}
 
diff --git a/src/vs/workbench/electron-browser/nodeCachedDataManager.ts b/src/vs/workbench/electron-browser/nodeCachedDataManager.ts
index b7c4c9e36d5..5f5ac8e12d7 100644
--- a/src/vs/workbench/electron-browser/nodeCachedDataManager.ts
+++ b/src/vs/workbench/electron-browser/nodeCachedDataManager.ts
@@ -33,11 +33,11 @@ export class NodeCachedDataManager {
 			// log each failure separately
 			if (err) {
 				/* __GDPR__
-				   "cachedDataError" : {
-					  "errorCode" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-					  "path": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" }
-				   }
-				 */
+					"cachedDataError" : {
+						"errorCode" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+						"path": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" }
+					}
+				*/
 				this._telemetryService.publicLog('cachedDataError', {
 					errorCode: err.errorCode,
 					path: basename(err.path)
@@ -47,12 +47,12 @@ export class NodeCachedDataManager {
 
 		// log summary
 		/* __GDPR__
-		   "cachedDataInfo" : {
-			  "didRequestCachedData" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "didRejectCachedData": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "didProduceCachedData": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-		   }
-		 */
+			"cachedDataInfo" : {
+				"didRequestCachedData" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"didRejectCachedData": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"didProduceCachedData": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+			}
+		*/
 		this._telemetryService.publicLog('cachedDataInfo', {
 			didRequestCachedData: Boolean(global.require.getConfig().nodeCachedDataDir),
 			didRejectCachedData,
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index ed0c0605689..7069ea3f443 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -200,27 +200,27 @@ export class WorkbenchShell {
 		// Telemetry: workspace info
 		const { filesToOpen, filesToCreate, filesToDiff } = this.configuration;
 		/* __GDPR__
-		   "workspaceLoad" : {
-			  "userAgent" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "windowSize.innerHeight": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "windowSize.innerWidth": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "windowSize.outerHeight": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "windowSize.outerWidth": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "emptyWorkbench": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "workbench.filesToOpen": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "workbench.filesToCreate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "workbench.filesToDiff": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "customKeybindingsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "theme": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "language": { "classification": "SystemMetaData", "purpose": "BusinessInsight" },
-			  "experiments": { "${inline}": [ "${IExperiments}" ] },
-			  "pinnedViewlets": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "restoredViewlet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "restoredEditors": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "pinnedViewlets": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "startupKind": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"workspaceLoad" : {
+				"userAgent" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"windowSize.innerHeight": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"windowSize.innerWidth": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"windowSize.outerHeight": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"windowSize.outerWidth": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"emptyWorkbench": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"workbench.filesToOpen": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"workbench.filesToCreate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"workbench.filesToDiff": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"customKeybindingsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"theme": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"language": { "classification": "SystemMetaData", "purpose": "BusinessInsight" },
+				"experiments": { "${inline}": [ "${IExperiments}" ] },
+				"pinnedViewlets": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"restoredViewlet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"restoredEditors": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"pinnedViewlets": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"startupKind": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('workspaceLoad', {
 			userAgent: navigator.userAgent,
 			windowSize: { innerHeight: window.innerHeight, innerWidth: window.innerWidth, outerHeight: window.outerHeight, outerWidth: window.outerWidth },
@@ -244,12 +244,12 @@ export class WorkbenchShell {
 		this.timerService.restoreViewletDuration = info.restoreViewletDuration;
 		this.extensionService.onReady().done(() => {
 			/* __GDPR__
-			   "startupTime" : {
-				   "${include}": [
-					  "${IStartupMetrics}"
-				   ]
-			   }
-			 */
+				"startupTime" : {
+					"${include}": [
+						"${IStartupMetrics}"
+					]
+				}
+			*/
 			this.telemetryService.publicLog('startupTime', this.timerService.startupMetrics);
 		});
 
@@ -318,11 +318,11 @@ export class WorkbenchShell {
 
 			const listener = idleMonitor.onStatusChange(status =>
 				/* __GDPR__
-				   "UserIdleStart" : {}
-				 */
+					"UserIdleStart" : {}
+				*/
 				/* __GDPR__
-				   "UserIdleStop" : {}
-				 */
+					"UserIdleStop" : {}
+				*/
 				this.telemetryService.publicLog(status === UserStatus.Active
 					? TelemetryService.IDLE_STOP_EVENT_NAME
 					: TelemetryService.IDLE_START_EVENT_NAME
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
index e11a4d36565..bdf4e7eeef2 100644
--- a/src/vs/workbench/electron-browser/window.ts
+++ b/src/vs/workbench/electron-browser/window.ts
@@ -146,11 +146,11 @@ export class ElectronWindow extends Themable {
 
 			this.commandService.executeCommand(request.id, ...args).done(_ => {
 				/* __GDPR__
-				   "commandExecuted" : {
-					  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"commandExecuted" : {
+						"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('commandExecuted', { id: request.id, from: request.from });
 			}, err => {
 				this.messageService.show(Severity.Error, err);
diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
index 911399623f6..fed2b8590fc 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
@@ -103,11 +103,11 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 			// log in telemetry
 			if (this.telemetryService) {
 				/* __GDPR__
-				   "workbenchActionExecuted" : {
-					  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"workbenchActionExecuted" : {
+						"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' });
 			}
 		}));
@@ -148,10 +148,10 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 		const position = parseFloat(this.$el.getComputedStyle().left) / window.innerWidth;
 		this.storageService.store(DEBUG_ACTIONS_WIDGET_POSITION_KEY, position, StorageScope.WORKSPACE);
 		/* __GDPR__
-		   "debug.actionswidgetposition" : {
-			  "position" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"debug.actionswidgetposition" : {
+				"position" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog(DEBUG_ACTIONS_WIDGET_POSITION_KEY, { position });
 	}
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
index a8205753a6f..0660d442cfa 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
@@ -412,8 +412,8 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 
 	public addLaunchConfiguration(): TPromise<any> {
 		/* __GDPR__
-		   "debug/addLaunchConfiguration" : {}
-		 */
+			"debug/addLaunchConfiguration" : {}
+		*/
 		this.telemetryService.publicLog('debug/addLaunchConfiguration');
 		let configurationsArrayPosition: Position;
 		const model = this.editor.getModel();
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 5ce56cb36a5..52015666642 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -609,8 +609,8 @@ export class DebugService implements debug.IDebugService {
 
 	public addReplExpression(name: string): TPromise<void> {
 		/* __GDPR__
-		   "debugService/addReplExpression" : {}
-		 */
+			"debugService/addReplExpression" : {}
+		*/
 		this.telemetryService.publicLog('debugService/addReplExpression');
 		return this.model.addReplExpression(this.viewModel.focusedProcess, this.viewModel.focusedStackFrame, name)
 			// Evaluate all watch expressions and fetch variables again since repl evaluation might have changed some.
@@ -914,16 +914,16 @@ export class DebugService implements debug.IDebugService {
 				this.updateStateAndEmit(session.getId(), debug.State.Running);
 
 				/* __GDPR__
-				   "debugSessionStart" : {
-					  "type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "breakpointCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "exceptionBreakpoints": { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-					  "watchExpressionsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "extensionName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-					  "isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "launchJsonExists": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"debugSessionStart" : {
+						"type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"breakpointCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"exceptionBreakpoints": { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+						"watchExpressionsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"extensionName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+						"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"launchJsonExists": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				return this.telemetryService.publicLog('debugSessionStart', {
 					type: configuration.type,
 					breakpointCount: this.model.getBreakpoints().length,
@@ -941,11 +941,11 @@ export class DebugService implements debug.IDebugService {
 
 				const errorMessage = error instanceof Error ? error.message : error;
 				/* __GDPR__
-				   "debugMisconfiguration" : {
-					  "type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "error": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"debugMisconfiguration" : {
+						"type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"error": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('debugMisconfiguration', { type: configuration ? configuration.type : undefined, error: errorMessage });
 				this.updateStateAndEmit(session.getId(), debug.State.Inactive);
 				if (!session.disconnected) {
@@ -1061,14 +1061,14 @@ export class DebugService implements debug.IDebugService {
 		const bpsExist = this.model.getBreakpoints().length > 0;
 		const process = this.model.getProcesses().filter(p => p.getId() === session.getId()).pop();
 		/* __GDPR__
-		   "debugSessionStop" : {
-			  "type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "success": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "sessionLengthInSeconds": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "breakpointCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "watchExpressionsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"debugSessionStop" : {
+				"type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"success": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"sessionLengthInSeconds": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"breakpointCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"watchExpressionsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('debugSessionStop', {
 			type: process && process.configuration.type,
 			success: session.emittedStopped || !bpsExist,
diff --git a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
index 291e72af77a..6ed9ed23c88 100644
--- a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
@@ -165,16 +165,16 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 				const telemetryMessage = error ? debug.formatPII(error.format, true, error.variables) : errorMessage;
 				if (error && error.sendTelemetry) {
 					/* __GDPR__
-					   "debugProtocolErrorResponse" : {
-						  "error" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					   }
-					 */
+						"debugProtocolErrorResponse" : {
+							"error" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						}
+					*/
 					this.telemetryService.publicLog('debugProtocolErrorResponse', { error: telemetryMessage });
 					if (this.customTelemetryService) {
 						/* __GDPR__TODO__
-						 * The message is sent in the name of the adapter but the adapter doesn't know about it. However, since adapters are an open-ended set,
-						 * we can not declared the events statically either.
-						 */
+							The message is sent in the name of the adapter but the adapter doesn't know about it.
+							However, since adapters are an open-ended set, we can not declared the events statically either.
+						*/
 						this.customTelemetryService.publicLog('debugProtocolErrorResponse', { error: telemetryMessage });
 					}
 				}
diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
index ac9343e7034..e49587e3c0c 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
@@ -266,12 +266,12 @@ export class ExtensionEditor extends BaseEditor {
 		this.transientDisposables = dispose(this.transientDisposables);
 
 		/* __GDPR__
-		   "extensionGallery:openExtension" : {
-			   "${include}": [
-				  "${GalleryExtensionTelemetryData}"
-			   ]
-		   }
-		 */
+			"extensionGallery:openExtension" : {
+				"${include}": [
+					"${GalleryExtensionTelemetryData}"
+				]
+			}
+		*/
 		this.telemetryService.publicLog('extensionGallery:openExtension', extension.telemetryData);
 
 		this.extensionReadme = new Cache(() => extension.getReadme());
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
index 961d417aec6..485063d9d14 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
@@ -115,11 +115,11 @@ export class ExtensionTipsService implements IExtensionTipsService {
 		const exeBased = distinct(this._exeBasedRecommendations);
 
 		/* __GDPR__
-		   "extensionRecommendations:unfiltered" : {
-			  "fileBased" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "exeBased": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"extensionRecommendations:unfiltered" : {
+				"fileBased" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"exeBased": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('extensionRecommendations:unfiltered', { fileBased, exeBased });
 
 		return distinct([...fileBased, ...exeBased]);
@@ -254,11 +254,11 @@ export class ExtensionTipsService implements IExtensionTipsService {
 							switch (choice) {
 								case 0:
 									/* __GDPR__
-									   "extensionRecommendations:popup" : {
-										  "userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-										  "extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-									   }
-									 */
+										"extensionRecommendations:popup" : {
+											"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+											"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+										}
+									*/
 									this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'show', extensionId: name });
 									return recommendationsAction.run();
 								case 1: this.importantRecommendationsIgnoreList.push(id);
@@ -268,20 +268,20 @@ export class ExtensionTipsService implements IExtensionTipsService {
 										StorageScope.GLOBAL
 									);
 									/* __GDPR__
-									   "extensionRecommendations:popup" : {
-										  "userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-										  "extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-									   }
-									 */
+										"extensionRecommendations:popup" : {
+											"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+											"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+										}
+									*/
 									this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: name });
 									return this.ignoreExtensionRecommendations();
 								case 2:
 									/* __GDPR__
-									   "extensionRecommendations:popup" : {
-										  "userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-										  "extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-									   }
-									 */
+										"extensionRecommendations:popup" : {
+											"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+											"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+										}
+									*/
 									this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'close', extensionId: name });
 							}
 						}, () => {
@@ -290,7 +290,7 @@ export class ExtensionTipsService implements IExtensionTipsService {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 									"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 								}
-							 */
+							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'cancelled', extensionId: name });
 						});
 					});
@@ -335,19 +335,19 @@ export class ExtensionTipsService implements IExtensionTipsService {
 				this.choiceService.choose(Severity.Info, message, options, 2).done(choice => {
 					switch (choice) {
 						case 0:
-						/* __GDPR__
-							"extensionRecommendations:popup" : {
-								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-							}
-						 */
-						this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'show' });
+							/* __GDPR__
+								"extensionRecommendations:popup" : {
+									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+								}
+							*/
+							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'show' });
 							return action.run();
 						case 1:
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 								}
-							 */
+							*/
 							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'neverShowAgain' });
 							return this.storageService.store(storageKey, true, StorageScope.WORKSPACE);
 						case 2:
@@ -355,7 +355,7 @@ export class ExtensionTipsService implements IExtensionTipsService {
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 								}
-							 */
+							*/
 							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'close' });
 					}
 				}, () => {
@@ -363,7 +363,7 @@ export class ExtensionTipsService implements IExtensionTipsService {
 						"extensionRecommendations:popup" : {
 							"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 						}
-					 */
+					*/
 					this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'cancelled' });
 				});
 			});
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
index 824757fac4d..2b8ed719ea3 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
@@ -69,23 +69,23 @@ export class KeymapExtensions implements IWorkbenchContribution {
 
 	private promptForDisablingOtherKeymaps(newKeymap: IExtensionStatus, oldKeymaps: IExtensionStatus[]): TPromise<void> {
 		/* __GDPR__FRAGMENT__
-		   "KeyMapsData" : {
-			  "newKeymap" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "oldKeymaps": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"KeyMapsData" : {
+				"newKeymap" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"oldKeymaps": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		const telemetryData: { [key: string]: any; } = {
 			newKeymap: newKeymap.identifier,
 			oldKeymaps: oldKeymaps.map(k => k.identifier)
 		};
 
 		/* __GDPR__
-		   "disableOtherKeymapsConfirmation" : {
-			   "${include}": [
-				  "${KeyMapsData}"
-			   ]
-		   }
-		 */
+			"disableOtherKeymapsConfirmation" : {
+				"${include}": [
+					"${KeyMapsData}"
+				]
+			}
+		*/
 		this.telemetryService.publicLog('disableOtherKeymapsConfirmation', telemetryData);
 		const message = localize('disableOtherKeymapsConfirmation', "Disable other keymaps ({0}) to avoid conflicts between keybindings?", oldKeymaps.map(k => `'${k.local.manifest.displayName}'`).join(', '));
 		const options = [
@@ -97,13 +97,13 @@ export class KeymapExtensions implements IWorkbenchContribution {
 				const confirmed = value === 0;
 				telemetryData['confirmed'] = confirmed;
 				/* __GDPR__
-				   "disableOtherKeymaps" : {
-					  "confirmed" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "${include}": [
-						 "${KeyMapsData}"
-					  ]
-				   }
-				 */
+					"disableOtherKeymaps" : {
+						"confirmed" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"${include}": [
+							"${KeyMapsData}"
+						]
+					}
+				*/
 				this.telemetryService.publicLog('disableOtherKeymaps', telemetryData);
 				if (confirmed) {
 					return TPromise.join(oldKeymaps.map(keymap => {
@@ -176,18 +176,18 @@ export class BetterMergeDisabled implements IWorkbenchContribution {
 			if (storageService.getBoolean(BetterMergeDisabledNowKey, StorageScope.GLOBAL, false)) {
 				storageService.remove(BetterMergeDisabledNowKey, StorageScope.GLOBAL);
 				/* __GDPR__
-				   "betterMergeDisabled" : {}
-				 */
+					"betterMergeDisabled" : {}
+				*/
 				telemetryService.publicLog('betterMergeDisabled');
 				messageService.show(Severity.Info, {
 					message: localize('betterMergeDisabled', "The Better Merge extension is now built-in, the installed extension was disabled and can be uninstalled."),
 					actions: [
 						new Action('uninstall', localize('uninstall', "Uninstall"), null, true, () => {
 							/* __GDPR__
-							   "betterMergeUninstall" : {
-								  "outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-							   }
-							 */
+								"betterMergeUninstall" : {
+									"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+								}
+							*/
 							telemetryService.publicLog('betterMergeUninstall', {
 								outcome: 'uninstall',
 							});
@@ -198,10 +198,10 @@ export class BetterMergeDisabled implements IWorkbenchContribution {
 						}),
 						new Action('later', localize('later', "Later"), null, true, () => {
 							/* __GDPR__
-							   "betterMergeUninstall" : {
-								  "outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-							   }
-							 */
+								"betterMergeUninstall" : {
+									"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+								}
+							*/
 							telemetryService.publicLog('betterMergeUninstall', {
 								outcome: 'later',
 							});
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index 5feec62cd87..98e10761626 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -316,10 +316,10 @@ export class ExtensionsListView extends ViewsViewletPanel {
 					.filter(name => name.toLowerCase().indexOf(value) > -1);
 
 				/* __GDPR__
-				   "extensionRecommendations:open" : {
-					  "count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"extensionRecommendations:open" : {
+						"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('extensionRecommendations:open', { count: names.length });
 
 				if (!names.length) {
@@ -340,10 +340,10 @@ export class ExtensionsListView extends ViewsViewletPanel {
 			.then(recommendations => {
 				const names = recommendations.filter(name => name.toLowerCase().indexOf(value) > -1);
 				/* __GDPR__
-				   "extensionWorkspaceRecommendations:open" : {
-					  "count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"extensionWorkspaceRecommendations:open" : {
+						"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('extensionWorkspaceRecommendations:open', { count: names.length });
 
 				if (!names.length) {
@@ -360,10 +360,10 @@ export class ExtensionsListView extends ViewsViewletPanel {
 		const names = this.tipsService.getKeymapRecommendations()
 			.filter(name => name.toLowerCase().indexOf(value) > -1);
 		/* __GDPR__
-		   "extensionKeymapRecommendations:open" : {
-			  "count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"extensionKeymapRecommendations:open" : {
+				"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('extensionKeymapRecommendations:open', { count: names.length });
 
 		if (!names.length) {
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
index b886bf89795..68666b6a409 100644
--- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -419,12 +419,12 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 
 	open(extension: IExtension, sideByside: boolean = false): TPromise<any> {
 		/* __GDPR__
-		   "extensionGallery:open" : {
-			   "${include}": [
-				  "${GalleryExtensionTelemetryData}"
-			   ]
-		   }
-		 */
+			"extensionGallery:open" : {
+				"${include}": [
+					"${GalleryExtensionTelemetryData}"
+				]
+			}
+		*/
 		this.telemetryService.publicLog('extensionGallery:open', extension.telemetryData);
 		return this.editorService.openEditor(this.instantiationService.createInstance(ExtensionsInput, extension), null, sideByside);
 	}
@@ -535,19 +535,19 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 
 		return this.promptAndSetEnablement(extension, enable, workspace).then(reload => {
 			/* __GDPR__
-			   "extension:enabled" : {
-				   "${include}": [
-					  "${GalleryExtensionTelemetryData}"
-				   ]
-			   }
-			 */
+				"extension:enabled" : {
+					"${include}": [
+						"${GalleryExtensionTelemetryData}"
+					]
+				}
+			*/
 			/* __GDPR__
-			   "extension:disable" : {
-				   "${include}": [
-					  "${GalleryExtensionTelemetryData}"
-				   ]
-			   }
-			 */
+				"extension:disable" : {
+					"${include}": [
+						"${GalleryExtensionTelemetryData}"
+					]
+				}
+			*/
 			this.telemetryService.publicLog(enable ? 'extension:enable' : 'extension:disable', extension.telemetryData);
 		});
 	}
@@ -816,35 +816,35 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 		const eventName = toTelemetryEventName(active.operation);
 
 		/* __GDPR__
-		   "extensionGallery:install" : {
-			  "success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "errorcode": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-			  "${include}": [
-				 "${GalleryExtensionTelemetryData}"
-			  ]
-		   }
-		 */
+			"extensionGallery:install" : {
+				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"errorcode": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				"${include}": [
+					"${GalleryExtensionTelemetryData}"
+				]
+			}
+		*/
 		/* __GDPR__
-		   "extensionGallery:update" : {
-			  "success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "errorcode": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-			  "${include}": [
-				 "${GalleryExtensionTelemetryData}"
-			  ]
-		   }
-		 */
+			"extensionGallery:update" : {
+				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"errorcode": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				"${include}": [
+					"${GalleryExtensionTelemetryData}"
+				]
+			}
+		*/
 		/* __GDPR__
-		   "extensionGallery:uninstall" : {
-			  "success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "errorcode": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-			  "${include}": [
-				 "${GalleryExtensionTelemetryData}"
-			  ]
-		   }
-		 */
+			"extensionGallery:uninstall" : {
+				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"errorcode": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				"${include}": [
+					"${GalleryExtensionTelemetryData}"
+				]
+			}
+		*/
 		this.telemetryService.publicLog(eventName, assign(data, { success: !errorcode, duration, errorcode }));
 	}
 
diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
index 833836aa42d..c088be1988d 100644
--- a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
@@ -538,11 +538,11 @@ export class FileController extends DefaultController {
 	public openEditor(stat: FileStat, options: { preserveFocus: boolean; sideBySide: boolean; pinned: boolean; }): void {
 		if (stat && !stat.isDirectory) {
 			/* __GDPR__
-			   "workbenchActionExecuted" : {
-				  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"workbenchActionExecuted" : {
+					"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'explorer' });
 
 			this.editorService.openEditor({ resource: stat.resource, options }, options.sideBySide).done(null, errors.onUnexpectedError);
diff --git a/src/vs/workbench/parts/files/browser/views/openEditorsViewer.ts b/src/vs/workbench/parts/files/browser/views/openEditorsViewer.ts
index 578e93f3e0e..a67a4d87ea6 100644
--- a/src/vs/workbench/parts/files/browser/views/openEditorsViewer.ts
+++ b/src/vs/workbench/parts/files/browser/views/openEditorsViewer.ts
@@ -274,11 +274,11 @@ export class Controller extends DefaultController {
 	public openEditor(element: OpenEditor, options: { preserveFocus: boolean; pinned: boolean; sideBySide: boolean; }): void {
 		if (element) {
 			/* __GDPR__
-			   "workbenchActionExecuted" : {
-				  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"workbenchActionExecuted" : {
+					"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'openEditors' });
 			let position = this.model.positionOfGroup(element.editorGroup);
 			if (options.sideBySide && position !== Position.THREE) {
diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
index 0bc00a4682d..5b957a68866 100644
--- a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
+++ b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
@@ -278,10 +278,10 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		descriptor['resource'] = telemetryURIDescriptor(this.getResource());
 
 		/* __GDPR__FRAGMENT__
-		   "EditorTelemetryDescriptor" : {
-			  "resource": { "${inline}": [ "${URIDescriptor}" ] }
-		   }
-		 */
+			"EditorTelemetryDescriptor" : {
+				"resource": { "${inline}": [ "${URIDescriptor}" ] }
+			}
+		*/
 		return descriptor;
 	}
 
diff --git a/src/vs/workbench/parts/markers/browser/markersPanel.ts b/src/vs/workbench/parts/markers/browser/markersPanel.ts
index 89563149e77..927959df287 100644
--- a/src/vs/workbench/parts/markers/browser/markersPanel.ts
+++ b/src/vs/workbench/parts/markers/browser/markersPanel.ts
@@ -149,10 +149,10 @@ export class MarkersPanel extends Panel {
 		if (element instanceof Marker) {
 			const marker: Marker = element;
 			/* __GDPR__
-			   "problems.marker.opened" : {
-				  "source" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"problems.marker.opened" : {
+					"source" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('problems.marker.opened', { source: marker.marker.source });
 			this.editorService.openEditor({
 				resource: marker.resource,
diff --git a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts
index 7459d9d0ded..12c2d2ad242 100644
--- a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts
+++ b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts
@@ -42,8 +42,8 @@ export class ToggleMarkersPanelAction extends TogglePanelAction {
 		let promise = super.run();
 		if (this.isPanelFocused()) {
 			/* __GDPR__
-			   "problems.used" : {}
-			 */
+				"problems.used" : {}
+			*/
 			this.telemetryService.publicLog('problems.used');
 		}
 		return promise;
@@ -67,8 +67,8 @@ export class ToggleErrorsAndWarningsAction extends TogglePanelAction {
 		let promise = super.run();
 		if (this.isPanelFocused()) {
 			/* __GDPR__
-			   "problems.used" : {}
-			 */
+				"problems.used" : {}
+			*/
 			this.telemetryService.publicLog('problems.used');
 		}
 		return promise;
@@ -84,8 +84,8 @@ export class CollapseAllAction extends TreeCollapseAction {
 
 	public run(context?: any): TPromise<any> {
 		/* __GDPR__
-		   "problems.collapseAll.used" : {}
-		 */
+			"problems.collapseAll.used" : {}
+		*/
 		this.telemetryService.publicLog('problems.collapseAll.used');
 		return super.run(context);
 	}
@@ -142,12 +142,12 @@ export class FilterInputBoxActionItem extends BaseActionItem {
 		data['warnings'] = this.markersPanel.markersModel.filterOptions.filterWarnings;
 		data['infos'] = this.markersPanel.markersModel.filterOptions.filterInfos;
 		/* __GDPR__
-		   "problems.filter" : {
-			  "errors" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "warnings": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "infos": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"problems.filter" : {
+				"errors" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"warnings": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"infos": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('problems.filter', data);
 	}
 
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index 694c2dc7b96..c4ee4bce0a9 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -522,11 +522,11 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 			};
 			this.latestEmptyFilters = [];
 			/* __GDPR__
-			   "keybindings.filter" : {
-				  "filter": { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-				  "emptyFilters" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"keybindings.filter" : {
+					"filter": { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+					"emptyFilters" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('keybindings.filter', data);
 		}
 	}
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 3aedcefcd57..8e18f891a89 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -324,11 +324,11 @@ export class PreferencesEditor extends BaseEditor {
 			};
 			this.latestEmptyFilters = [];
 			/* __GDPR__
-			   "defaultSettings.filter" : {
-				  "filter": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "emptyFilters" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"defaultSettings.filter" : {
+					"filter": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"emptyFilters" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('defaultSettings.filter', data);
 		}
 	}
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index a3b86ba458f..d74dd56da46 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -109,10 +109,10 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 
 	public updatePreference(key: string, value: any, source: ISetting): void {
 		/* __GDPR__
-		   "defaultSettingsActions.copySetting" : {
-			  "userConfigurationKeys" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"defaultSettingsActions.copySetting" : {
+				"userConfigurationKeys" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('defaultSettingsActions.copySetting', { userConfigurationKeys: [key] });
 		const overrideIdentifier = source.overrideOf ? overrideIdentifierFromKey(source.overrideOf.key) : null;
 		const resource = this.preferencesModel.uri;
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/parts/preferences/browser/preferencesService.ts
index 203b3487e0a..5e5597721c6 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesService.ts
@@ -224,10 +224,10 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 	openGlobalKeybindingSettings(textual: boolean): TPromise<void> {
 		/* __GDPR__
-		   "openKeybindings" : {
-			  "textual" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"openKeybindings" : {
+				"textual" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('openKeybindings', { textual });
 		if (textual) {
 			const emptyContents = '// ' + nls.localize('emptyKeybindingsHeader', "Place your key bindings in this file to overwrite the defaults") + '\n[\n]';
diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
index a09aaf6b7b8..2e4ec96cf1a 100644
--- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
@@ -298,11 +298,11 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 			if (action && (!(action instanceof Action) || action.enabled)) {
 				try {
 					/* __GDPR__
-					   "workbenchActionExecuted" : {
-						  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					   }
-					 */
+						"workbenchActionExecuted" : {
+							"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						}
+					*/
 					this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'quick open' });
 					(action.run() || TPromise.as(null)).done(() => {
 						if (action instanceof Action) {
diff --git a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
index bf411c9079a..7cbc0a22700 100644
--- a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
@@ -33,37 +33,37 @@ interface ISearchWithRange {
 }
 
 /* __GDPR__FRAGMENT__
-   "ITimerEventData" : {
-	  "searchLength" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "unsortedResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "sortedResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "resultCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "symbols.fromCache": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.fromCache": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.unsortedResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.sortedResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.resultCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.traversal": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.errors": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.fileWalkStartDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.fileWalkResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.directoriesWalked": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.filesWalked": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.cmdForkStartTime": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.cmdForkResultTime": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.cmdResultCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.cacheLookupStartDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.cacheFilterStartDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.cacheLookupResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files.cacheEntryCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "${wildcard}": [
-		 {
-			"${prefix}": "files.joined",
+	"ITimerEventData" : {
+		"searchLength" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"unsortedResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"sortedResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"resultCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"symbols.fromCache": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.fromCache": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.unsortedResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.sortedResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.resultCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.traversal": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.errors": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.fileWalkStartDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.fileWalkResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.directoriesWalked": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.filesWalked": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.cmdForkStartTime": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.cmdForkResultTime": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.cmdResultCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.cacheLookupStartDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.cacheFilterStartDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.cacheLookupResultDuration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"files.cacheEntryCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"${wildcard}": [
+			{
+				"${prefix}": "files.joined",
 			"${classification}": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-		 }
-	  ]
-   }
- */
+			}
+		]
+	}
+*/
 interface ITimerEventData {
 	searchLength: number;
 	unsortedResultDuration: number;
@@ -242,13 +242,13 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 					});
 
 					/* __GDPR__
-					   "openAnything" : {
-						  "duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-						  "${include}": [
-							 "${ITimerEventData}"
-						  ]
-					   }
-					 */
+						"openAnything" : {
+							"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+							"${include}": [
+								"${ITimerEventData}"
+							]
+						}
+					*/
 					this.telemetryService.publicLog('openAnything', objects.assign(data, { duration }));
 				});
 
diff --git a/src/vs/workbench/parts/search/browser/patternInputWidget.ts b/src/vs/workbench/parts/search/browser/patternInputWidget.ts
index 08386257d11..e282dfcb600 100644
--- a/src/vs/workbench/parts/search/browser/patternInputWidget.ts
+++ b/src/vs/workbench/parts/search/browser/patternInputWidget.ts
@@ -242,8 +242,8 @@ export class ExcludePatternInputWidget extends PatternInputWidget {
 			isChecked: false,
 			onChange: (viaKeyboard) => {
 				/* __GDPR__
-				   "search.useIgnoreFiles.toggled" : {}
-				 */
+					"search.useIgnoreFiles.toggled" : {}
+				*/
 				this.telemetryService.publicLog('search.useIgnoreFiles.toggled');
 				this.onOptionChange(null);
 				if (!viaKeyboard) {
@@ -259,8 +259,8 @@ export class ExcludePatternInputWidget extends PatternInputWidget {
 			isChecked: false,
 			onChange: (viaKeyboard) => {
 				/* __GDPR__
-				   "search.useExcludeSettings.toggled" : {}
-				 */
+					"search.useExcludeSettings.toggled" : {}
+				*/
 				this.telemetryService.publicLog('search.useExcludeSettings.toggled');
 				this.onOptionChange(null);
 				if (!viaKeyboard) {
diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts
index 00449eed5e0..2a302d947ea 100644
--- a/src/vs/workbench/parts/search/browser/replaceService.ts
+++ b/src/vs/workbench/parts/search/browser/replaceService.ts
@@ -138,8 +138,8 @@ export class ReplaceService implements IReplaceService {
 
 	public openReplacePreview(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): TPromise<any> {
 		/* __GDPR__
-		   "replace.open.previewEditor" : {}
-		 */
+			"replace.open.previewEditor" : {}
+		*/
 		this.telemetryService.publicLog('replace.open.previewEditor');
 		const fileMatch = element instanceof Match ? element.parent() : element;
 
diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index e841a394ecb..9e9f3113d47 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -550,8 +550,8 @@ export class ReplaceAllAction extends AbstractSearchAndReplaceAction {
 
 	public run(): TPromise<any> {
 		/* __GDPR__
-		   "replaceAll.action.selected" : {}
-		 */
+			"replaceAll.action.selected" : {}
+		*/
 		this.telemetryService.publicLog('replaceAll.action.selected');
 		let nextFocusElement = this.getElementToFocusAfterRemoved(this.viewer, this.fileMatch);
 		return this.fileMatch.parent().replace(this.fileMatch).then(() => {
@@ -577,8 +577,8 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
 	public run(): TPromise<any> {
 		this.enabled = false;
 		/* __GDPR__
-		   "replace.action.selected" : {}
-		 */
+			"replace.action.selected" : {}
+		*/
 		this.telemetryService.publicLog('replace.action.selected');
 
 		return this.element.parent().replace(this.element).then(() => {
diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts
index e8500605299..ec62e39262e 100644
--- a/src/vs/workbench/parts/search/browser/searchViewlet.ts
+++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts
@@ -854,8 +854,8 @@ export class SearchViewlet extends Viewlet {
 
 	public toggleQueryDetails(moveFocus?: boolean, show?: boolean, skipLayout?: boolean, reverse?: boolean): void {
 		/* __GDPR__
-		   "search.toggleQueryDetails" : {}
-		 */
+			"search.toggleQueryDetails" : {}
+		*/
 		this.telemetryService.publicLog('search.toggleQueryDetails');
 
 		let cls = 'more';
@@ -1333,8 +1333,8 @@ export class SearchViewlet extends Viewlet {
 		}
 
 		/* __GDPR__
-		   "searchResultChosen" : {}
-		 */
+			"searchResultChosen" : {}
+		*/
 		this.telemetryService.publicLog('searchResultChosen');
 
 		return (this.viewModel.isReplaceActive() && !!this.viewModel.replaceString) ?
diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts
index ad4f3ad0ffb..06bb041cdab 100644
--- a/src/vs/workbench/parts/search/common/searchModel.ts
+++ b/src/vs/workbench/parts/search/common/searchModel.ts
@@ -569,10 +569,10 @@ export class SearchResult extends Disposable {
 		const promise = this.replaceService.replace(this.matches(), progressRunner);
 		const onDone = stopwatch(fromPromise(promise));
 		/* __GDPR__
-		   "replaceAll.started" : {
-			  "duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-		   }
-		 */
+			"replaceAll.started" : {
+				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+			}
+		*/
 		onDone(duration => this.telemetryService.publicLog('replaceAll.started', { duration }));
 
 		return promise.then(() => {
@@ -731,20 +731,20 @@ export class SearchModel extends Disposable {
 		const onFirstRender = any(onDone, progressEmitter.event);
 		const onFirstRenderStopwatch = stopwatch(onFirstRender);
 		/* __GDPR__
-		   "searchResultsFirstRender" : {
-			  "duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-		   }
-		 */
+			"searchResultsFirstRender" : {
+				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+			}
+		*/
 		onFirstRenderStopwatch(duration => this.telemetryService.publicLog('searchResultsFirstRender', { duration }));
 
 		const onDoneStopwatch = stopwatch(onDone);
 		const start = Date.now();
 
 		/* __GDPR__
-		   "searchResultsFinished" : {
-			  "duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-		   }
-		 */
+			"searchResultsFinished" : {
+				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+			}
+		*/
 		onDoneStopwatch(duration => this.telemetryService.publicLog('searchResultsFinished', { duration }));
 
 		const currentRequest = this.currentRequest;
@@ -770,14 +770,14 @@ export class SearchModel extends Disposable {
 		const options: IPatternInfo = objects.assign({}, this._searchQuery.contentPattern);
 		delete options.pattern;
 		/* __GDPR__
-		   "searchresultsShown" : {
-			  "count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "fileCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "options": { "${inline}": [ "${IPatternInfo}" ] },
-			  "duration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-			  "useRipgrep": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"searchresultsShown" : {
+				"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"fileCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"options": { "${inline}": [ "${IPatternInfo}" ] },
+				"duration": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"useRipgrep": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('searchResultsShown', {
 			count: this._searchResult.count(),
 			fileCount: this._searchResult.fileCount(),
diff --git a/src/vs/workbench/parts/tasks/common/taskSystem.ts b/src/vs/workbench/parts/tasks/common/taskSystem.ts
index 3edda7015f6..e401c172652 100644
--- a/src/vs/workbench/parts/tasks/common/taskSystem.ts
+++ b/src/vs/workbench/parts/tasks/common/taskSystem.ts
@@ -37,15 +37,15 @@ export class TaskError {
 }
 
 /* __GDPR__FRAGMENT__
-   "TelemetryEvent" : {
+	"TelemetryEvent" : {
 		"trigger" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"runner": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"taskKind": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"command": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"success": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"exitCode": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-}
- */
+	}
+*/
 export interface TelemetryEvent {
 	// How the task got trigger. Is either shortcut or command
 	trigger: string;
diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
index 34eb91a1b63..3d6b5ebfe85 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -1099,10 +1099,10 @@ class TaskService extends EventEmitter implements ITaskService {
 				properties: properties ? Object.getOwnPropertyNames(properties) : []
 			};
 			/* __GDPR__
-			   "taskService.customize" : {
-				  "properties" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"taskService.customize" : {
+					"properties" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog(TaskService.CustomizationTelemetryEventName, event);
 			if (openConfig) {
 				let resource = workspaceFolder.toResource('.vscode/tasks.json');
diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
index 3cbf2b234e3..a7fed0b13a0 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
@@ -411,12 +411,12 @@ export class TerminalTaskSystem extends EventEmitter implements ITaskSystem {
 					exitCode: summary.exitCode
 				};
 				/* __GDPR__
-				   "taskService" : {
-					   "${include}": [
-						  "${TelemetryEvent}"
-					   ]
+					"taskService" : {
+						"${include}": [
+							"${TelemetryEvent}"
+						]
 					}
-				 */
+				*/
 				this.telemetryService.publicLog(TerminalTaskSystem.TelemetryEventName, telemetryEvent);
 			} catch (error) {
 			}
@@ -431,12 +431,12 @@ export class TerminalTaskSystem extends EventEmitter implements ITaskSystem {
 					success: false
 				};
 				/* __GDPR__
-				   "taskService" : {
-					   "${include}": [
-						  "${TelemetryEvent}"
-					   ]
-				   }
-				 */
+					"taskService" : {
+						"${include}": [
+							"${TelemetryEvent}"
+						]
+					}
+				*/
 				this.telemetryService.publicLog(TerminalTaskSystem.TelemetryEventName, telemetryEvent);
 			} catch (error) {
 			}
diff --git a/src/vs/workbench/parts/tasks/node/processTaskSystem.ts b/src/vs/workbench/parts/tasks/node/processTaskSystem.ts
index 05ddc641bb4..3a31c8ccac3 100644
--- a/src/vs/workbench/parts/tasks/node/processTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/node/processTaskSystem.ts
@@ -147,23 +147,23 @@ export class ProcessTaskSystem extends EventEmitter implements ITaskSystem {
 			let result = this.doExecuteTask(task, telemetryEvent);
 			result.promise = result.promise.then((success) => {
 				/* __GDPR__
-				   "taskService" : {
-					   "${include}": [
-						  "${TelemetryEvent}"
-					   ]
-				   }
-				 */
+					"taskService" : {
+						"${include}": [
+							"${TelemetryEvent}"
+						]
+					}
+				*/
 				this.telemetryService.publicLog(ProcessTaskSystem.TelemetryEventName, telemetryEvent);
 				return success;
 			}, (err: any) => {
 				telemetryEvent.success = false;
 				/* __GDPR__
-				   "taskService" : {
-					   "${include}": [
-						  "${TelemetryEvent}"
-					   ]
-				   }
-				 */
+					"taskService" : {
+						"${include}": [
+							"${TelemetryEvent}"
+						]
+					}
+				*/
 				this.telemetryService.publicLog(ProcessTaskSystem.TelemetryEventName, telemetryEvent);
 				return TPromise.wrapError<ITaskSummary>(err);
 			});
@@ -171,12 +171,12 @@ export class ProcessTaskSystem extends EventEmitter implements ITaskSystem {
 		} catch (err) {
 			telemetryEvent.success = false;
 			/* __GDPR__
-			   "taskService" : {
-				   "${include}": [
-					  "${TelemetryEvent}"
-				   ]
-			   }
-			 */
+				"taskService" : {
+					"${include}": [
+						"${TelemetryEvent}"
+					]
+				}
+			*/
 			this.telemetryService.publicLog(ProcessTaskSystem.TelemetryEventName, telemetryEvent);
 			if (err instanceof TaskError) {
 				throw err;
diff --git a/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts b/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
index f6741169902..21dbeb9472c 100644
--- a/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
+++ b/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
@@ -71,8 +71,8 @@ class UnsupportedWorkspaceSettingsContribution implements IWorkbenchContribution
 
 		const openWorkspaceSettings = new Action('unsupportedWorkspaceSettings.openWorkspaceSettings', nls.localize('openWorkspaceSettings', 'Open Workspace Settings'), '', true, () => {
 			/* __GDPR__
-			   "workspace.settings.unsupported.review" : {}
-			 */
+				"workspace.settings.unsupported.review" : {}
+			*/
 			this.telemetryService.publicLog('workspace.settings.unsupported.review');
 			this.rememberWarningWasShown();
 			return this.preferencesService.openWorkspaceSettings();
@@ -80,8 +80,8 @@ class UnsupportedWorkspaceSettingsContribution implements IWorkbenchContribution
 
 		const openDocumentation = new Action('unsupportedWorkspaceSettings.openDocumentation', nls.localize('openDocumentation', 'Learn More'), '', true, () => {
 			/* __GDPR__
-			   "workspace.settings.unsupported.documentation" : {}
-			 */
+				"workspace.settings.unsupported.documentation" : {}
+			*/
 			this.telemetryService.publicLog('workspace.settings.unsupported.documentation');
 			this.rememberWarningWasShown();
 			window.open('https://go.microsoft.com/fwlink/?linkid=839878'); // Don't change link.
@@ -90,8 +90,8 @@ class UnsupportedWorkspaceSettingsContribution implements IWorkbenchContribution
 
 		const close = new Action('unsupportedWorkspaceSettings.Ignore', nls.localize('ignore', 'Ignore'), '', true, () => {
 			/* __GDPR__
-			   "workspace.settings.unsupported.ignore" : {}
-			 */
+				"workspace.settings.unsupported.ignore" : {}
+			*/
 			this.telemetryService.publicLog('workspace.settings.unsupported.ignore');
 			this.rememberWarningWasShown();
 			return TPromise.as(true);
@@ -100,8 +100,8 @@ class UnsupportedWorkspaceSettingsContribution implements IWorkbenchContribution
 		const actions = [openWorkspaceSettings, openDocumentation, close];
 		this.messageService.show(Severity.Warning, { message, actions });
 		/* __GDPR__
-		   "workspace.settings.unsupported.warning" : {}
-		 */
+			"workspace.settings.unsupported.warning" : {}
+		*/
 		this.telemetryService.publicLog('workspace.settings.unsupported.warning');
 	}
 }
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
index ff447c18678..93be1d9e534 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
@@ -149,31 +149,31 @@ interface Strings {
 }
 
 /* __GDPR__
-   "installExtension" : {
-	   "${include}": [
-		  "${WelcomePageInstall-1}"
-	   ]
-   }
- */
+	"installExtension" : {
+		"${include}": [
+			"${WelcomePageInstall-1}"
+		]
+	}
+*/
 /* __GDPR__
-   "installedExtension" : {
-	   "${include}": [
-		  "${WelcomePageInstalled-1}",
-		  "${WelcomePageInstalled-2}",
-		  "${WelcomePageInstalled-3}",
-		  "${WelcomePageInstalled-4}",
-		  "${WelcomePageInstalled-5}",
-		  "${WelcomePageInstalled-6}"
-	   ]
-   }
- */
+	"installedExtension" : {
+		"${include}": [
+			"${WelcomePageInstalled-1}",
+			"${WelcomePageInstalled-2}",
+			"${WelcomePageInstalled-3}",
+			"${WelcomePageInstalled-4}",
+			"${WelcomePageInstalled-5}",
+			"${WelcomePageInstalled-6}"
+		]
+	}
+*/
 /* __GDPR__
-   "detailsExtension" : {
-	   "${include}": [
-		  "${WelcomePageDetails-1}"
-	   ]
-   }
- */
+	"detailsExtension" : {
+		"${include}": [
+			"${WelcomePageDetails-1}"
+		]
+	}
+*/
 const extensionPackStrings: Strings = {
 	installEvent: 'installExtension',
 	installedEvent: 'installedExtension',
@@ -186,31 +186,31 @@ const extensionPackStrings: Strings = {
 };
 
 /* __GDPR__
-   "installKeymap" : {
-	   "${include}": [
-		  "${WelcomePageInstall-1}"
-	   ]
-   }
- */
+	"installKeymap" : {
+		"${include}": [
+			"${WelcomePageInstall-1}"
+		]
+	}
+*/
 /* __GDPR__
-   "installedKeymap" : {
-	   "${include}": [
-		  "${WelcomePageInstalled-1}",
-		  "${WelcomePageInstalled-2}",
-		  "${WelcomePageInstalled-3}",
-		  "${WelcomePageInstalled-4}",
-		  "${WelcomePageInstalled-5}",
-		  "${WelcomePageInstalled-6}"
-	   ]
-   }
- */
+	"installedKeymap" : {
+		"${include}": [
+			"${WelcomePageInstalled-1}",
+			"${WelcomePageInstalled-2}",
+			"${WelcomePageInstalled-3}",
+			"${WelcomePageInstalled-4}",
+			"${WelcomePageInstalled-5}",
+			"${WelcomePageInstalled-6}"
+		]
+	}
+*/
 /* __GDPR__
-   "detailsKeymap" : {
-	   "${include}": [
-		  "${WelcomePageDetails-1}"
-	   ]
-   }
- */
+	"detailsKeymap" : {
+		"${include}": [
+			"${WelcomePageDetails-1}"
+		]
+	}
+*/
 const keymapStrings: Strings = {
 	installEvent: 'installKeymap',
 	installedEvent: 'installedKeymap',
@@ -324,11 +324,11 @@ class WelcomePage {
 				a.href = 'javascript:void(0)';
 				a.addEventListener('click', e => {
 					/* __GDPR__
-					   "workbenchActionExecuted" : {
-						  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					   }
-					 */
+						"workbenchActionExecuted" : {
+							"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						}
+					*/
 					this.telemetryService.publicLog('workbenchActionExecuted', {
 						id: 'openRecentFolder',
 						from: telemetryFrom
@@ -409,11 +409,11 @@ class WelcomePage {
 
 	private installExtension(extensionSuggestion: ExtensionSuggestion, strings: Strings): void {
 		/* __GDPR__FRAGMENT__
-		   "WelcomePageInstall-1" : {
-			  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"WelcomePageInstall-1" : {
+				"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog(strings.installEvent, {
 			from: telemetryFrom,
 			extensionId: extensionSuggestion.id,
@@ -422,12 +422,12 @@ class WelcomePage {
 			const installedExtension = arrays.first(extensions, extension => extension.identifier === extensionSuggestion.id);
 			if (installedExtension && installedExtension.globallyEnabled) {
 				/* __GDPR__FRAGMENT__
-				   "WelcomePageInstalled-1" : {
-					  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"WelcomePageInstalled-1" : {
+						"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog(strings.installedEvent, {
 					from: telemetryFrom,
 					extensionId: extensionSuggestion.id,
@@ -471,12 +471,12 @@ class WelcomePage {
 										return this.extensionEnablementService.setEnablement(extensionSuggestion.id, true)
 											.then(() => {
 												/* __GDPR__FRAGMENT__
-												   "WelcomePageInstalled-2" : {
-													  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-													  "extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-													  "outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-												   }
-												 */
+													"WelcomePageInstalled-2" : {
+														"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+														"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+														"outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+													}
+												*/
 												this.telemetryService.publicLog(strings.installedEvent, {
 													from: telemetryFrom,
 													extensionId: extensionSuggestion.id,
@@ -486,12 +486,12 @@ class WelcomePage {
 											});
 									} else {
 										/* __GDPR__FRAGMENT__
-										   "WelcomePageInstalled-3" : {
-											  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-											  "extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-											  "outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-										   }
-										 */
+											"WelcomePageInstalled-3" : {
+												"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+												"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+												"outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+											}
+										*/
 										this.telemetryService.publicLog(strings.installedEvent, {
 											from: telemetryFrom,
 											extensionId: extensionSuggestion.id,
@@ -503,13 +503,13 @@ class WelcomePage {
 								});
 							}).then(null, err => {
 								/* __GDPR__FRAGMENT__
-								   "WelcomePageInstalled-4" : {
-									  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-									  "extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-									  "outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-									  "error": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-								   }
-								 */
+									"WelcomePageInstalled-4" : {
+										"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+										"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+										"outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+										"error": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+									}
+								*/
 								this.telemetryService.publicLog(strings.installedEvent, {
 									from: telemetryFrom,
 									extensionId: extensionSuggestion.id,
@@ -522,11 +522,11 @@ class WelcomePage {
 					}),
 					new Action('details', localize('details', "Details"), null, true, () => {
 						/* __GDPR__FRAGMENT__
-						   "WelcomePageDetails-1" : {
-							  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							  "extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-						   }
-						 */
+							"WelcomePageDetails-1" : {
+								"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							}
+						*/
 						this.telemetryService.publicLog(strings.detailsEvent, {
 							from: telemetryFrom,
 							extensionId: extensionSuggestion.id,
@@ -538,12 +538,12 @@ class WelcomePage {
 					}),
 					new Action('cancel', localize('cancel', "Cancel"), null, true, () => {
 						/* __GDPR__FRAGMENT__
-						   "WelcomePageInstalled-5" : {
-							  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							  "extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							  "outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-						   }
-						 */
+							"WelcomePageInstalled-5" : {
+								"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							}
+						*/
 						this.telemetryService.publicLog(strings.installedEvent, {
 							from: telemetryFrom,
 							extensionId: extensionSuggestion.id,
@@ -555,13 +555,13 @@ class WelcomePage {
 			});
 		}).then(null, err => {
 			/* __GDPR__FRAGMENT__
-			   "WelcomePageInstalled-6" : {
-				  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "error": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-			   }
-			 */
+				"WelcomePageInstalled-6" : {
+					"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"error": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				}
+			*/
 			this.telemetryService.publicLog(strings.installedEvent, {
 				from: telemetryFrom,
 				extensionId: extensionSuggestion.id,
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
index 94f97255ff3..3795d6aabd1 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
@@ -179,12 +179,12 @@ export class WalkThroughPart extends BaseEditor {
 					if (baseElement && node.href.indexOf(baseElement.href) >= 0 && node.hash) {
 						let scrollTarget = this.content.querySelector(node.hash);
 						/* __GDPR__
-						   "revealInDocument" : {
-							  "hash" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							  "broken": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-							  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-						   }
-						 */
+							"revealInDocument" : {
+								"hash" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"broken": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+								"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							}
+						*/
 						this.telemetryService.publicLog('revealInDocument', {
 							hash: node.hash,
 							broken: !scrollTarget,
@@ -217,11 +217,11 @@ export class WalkThroughPart extends BaseEditor {
 	private open(uri: URI) {
 		if (uri.scheme === 'http' || uri.scheme === 'https') {
 			/* __GDPR__
-			   "openExternal" : {
-				  "uri" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"openExternal" : {
+					"uri" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('openExternal', {
 				uri: uri.toString(true),
 				from: this.input instanceof WalkThroughInput ? this.input.getTelemetryFrom() : undefined
@@ -355,11 +355,11 @@ export class WalkThroughPart extends BaseEditor {
 
 					const options = this.getEditorOptions(snippet.textEditorModel.getModeId());
 					/* __GDPR__FRAGMENT__
-					   "EditorTelemetryData" : {
-						  "target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						  "snippet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					   }
-					 */
+						"EditorTelemetryData" : {
+							"target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"snippet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						}
+					*/
 					const telemetryData = {
 						target: this.input instanceof WalkThroughInput ? this.input.getTelemetryFrom() : undefined,
 						snippet: i
@@ -409,12 +409,12 @@ export class WalkThroughPart extends BaseEditor {
 
 					this.contentDisposables.push(once(editor.onMouseDown)(() => {
 						/* __GDPR__
-						   "walkThroughSnippetInteraction" : {
-							  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							  "type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							  "snippet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-						   }
-						 */
+							"walkThroughSnippetInteraction" : {
+								"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"snippet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							}
+						*/
 						this.telemetryService.publicLog('walkThroughSnippetInteraction', {
 							from: this.input instanceof WalkThroughInput ? this.input.getTelemetryFrom() : undefined,
 							type: 'mouseDown',
@@ -423,12 +423,12 @@ export class WalkThroughPart extends BaseEditor {
 					}));
 					this.contentDisposables.push(once(editor.onKeyDown)(() => {
 						/* __GDPR__
-						   "walkThroughSnippetInteraction" : {
-							  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							  "type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							  "snippet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-						   }
-						 */
+							"walkThroughSnippetInteraction" : {
+								"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"snippet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							}
+						*/
 						this.telemetryService.publicLog('walkThroughSnippetInteraction', {
 							from: this.input instanceof WalkThroughInput ? this.input.getTelemetryFrom() : undefined,
 							type: 'keyDown',
@@ -437,12 +437,12 @@ export class WalkThroughPart extends BaseEditor {
 					}));
 					this.contentDisposables.push(once(editor.onDidChangeModelContent)(() => {
 						/* __GDPR__
-						   "walkThroughSnippetInteraction" : {
-							  "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							  "type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							  "snippet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-						   }
-						 */
+							"walkThroughSnippetInteraction" : {
+								"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"snippet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							}
+						*/
 						this.telemetryService.publicLog('walkThroughSnippetInteraction', {
 							from: this.input instanceof WalkThroughInput ? this.input.getTelemetryFrom() : undefined,
 							type: 'changeModelContent',
diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
index 1b2a25daf69..98a5ffc7c8d 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
@@ -94,11 +94,11 @@ export class WalkThroughInput extends EditorInput {
 		descriptor['target'] = this.getTelemetryFrom();
 		descriptor['resource'] = telemetryURIDescriptor(this.options.resource);
 		/* __GDPR__FRAGMENT__
-		   "EditorTelemetryDescriptor" : {
-			  "target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "resource": { "${inline}": [ "${URIDescriptor}" ] }
-		   }
-		 */
+			"EditorTelemetryDescriptor" : {
+				"target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"resource": { "${inline}": [ "${URIDescriptor}" ] }
+			}
+		*/
 		return descriptor;
 	}
 
@@ -172,10 +172,10 @@ export class WalkThroughInput extends EditorInput {
 		if (!this.resolveTime) {
 			this.resolveTime = Date.now();
 			/* __GDPR__
-			   "resolvingInput" : {
-				  "target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"resolvingInput" : {
+					"target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('resolvingInput', {
 				target: this.getTelemetryFrom(),
 			});
@@ -185,14 +185,14 @@ export class WalkThroughInput extends EditorInput {
 	private disposeTelemetry(reason?: ShutdownReason) {
 		if (this.resolveTime) {
 			/* __GDPR__
-			   "disposingInput" : {
-				  "target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "timeSpent": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "reason": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "maxTopScroll": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "maxBottomScroll": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"disposingInput" : {
+					"target" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"timeSpent": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"reason": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"maxTopScroll": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"maxBottomScroll": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('disposingInput', {
 				target: this.getTelemetryFrom(),
 				timeSpent: (Date.now() - this.resolveTime) / 60,
diff --git a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
index 34515dba9b4..d6e303791af 100644
--- a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
+++ b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
@@ -112,11 +112,11 @@ export class ContextMenuService implements IContextMenuService {
 
 	private runAction(actionRunner: IActionRunner, actionToRun: IAction, delegate: IContextMenuDelegate, event: IEvent): void {
 		/* __GDPR__
-		   "workbenchActionExecuted" : {
-			  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"workbenchActionExecuted" : {
+				"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('workbenchActionExecuted', { id: actionToRun.id, from: 'contextMenu' });
 
 		const context = delegate.getActionsContext ? delegate.getActionsContext(event) : event;
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index af7c9fda003..46852ac7907 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -301,11 +301,11 @@ export class ExtensionService implements IExtensionService {
 			];
 
 			/* __GDPR__
-			   "extensionsScanned" : {
-				  "totalCount" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "disabledCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-			   }
-			 */
+				"extensionsScanned" : {
+					"totalCount" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"disabledCount": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				}
+			*/
 			this._telemetryService.publicLog('extensionsScanned', {
 				totalCount: installedExtensions.length,
 				disabledCount: disabledExtensions.length
@@ -354,13 +354,13 @@ export class ExtensionService implements IExtensionService {
 		if (!this._isDev && msg.extensionId) {
 			const { type, extensionId, extensionPointId, message } = msg;
 			/* __GDPR__
-			   "extensionsMessage" : {
-				  "type" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "extensionId": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "extensionPointId": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				  "message": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-			   }
-			 */
+				"extensionsMessage" : {
+					"type" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"extensionId": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"extensionPointId": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"message": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				}
+			*/
 			this._telemetryService.publicLog('extensionsMessage', {
 				type, extensionId, extensionPointId, message
 			});
diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
index 57bf0f221fa..b4c10edb678 100644
--- a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
+++ b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
@@ -319,10 +319,10 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 		keybindingsTelemetry(telemetryService, this);
 		let data = KeyboardMapperFactory.INSTANCE.getCurrentKeyboardLayout();
 		/* __GDPR__
-		   "keyboardLayout" : {
-			   "currentKeyboardLayout": { "${inline}": [ "${IKeyboardLayoutInfo}" ] }
-		   }
-		 */
+			"keyboardLayout" : {
+				"currentKeyboardLayout": { "${inline}": [ "${IKeyboardLayoutInfo}" ] }
+			}
+		*/
 		telemetryService.publicLog('keyboardLayout', {
 			currentKeyboardLayout: data
 		});
@@ -411,10 +411,10 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 			let cnt = extraUserKeybindings.length;
 
 			/* __GDPR__
-			   "customKeybindingsChanged" : {
-				  "keyCount" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"customKeybindingsChanged" : {
+					"keyCount" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('customKeybindingsChanged', {
 				keyCount: cnt
 			});
diff --git a/src/vs/workbench/services/message/browser/messageList.ts b/src/vs/workbench/services/message/browser/messageList.ts
index 67b2e2623a5..e1b5be6d5a6 100644
--- a/src/vs/workbench/services/message/browser/messageList.ts
+++ b/src/vs/workbench/services/message/browser/messageList.ts
@@ -305,11 +305,11 @@ export class MessageList {
 								DOM.EventHelper.stop(e, true);
 
 								/* __GDPR__
-								   "workbenchActionExecuted" : {
-									  "id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-									  "from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-								   }
-								 */
+									"workbenchActionExecuted" : {
+										"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+										"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+									}
+								*/
 								this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'message' });
 
 								(action.run() || TPromise.as(null))
diff --git a/src/vs/workbench/services/telemetry/common/workspaceStats.ts b/src/vs/workbench/services/telemetry/common/workspaceStats.ts
index cd737abb95c..5bdecfc2d37 100644
--- a/src/vs/workbench/services/telemetry/common/workspaceStats.ts
+++ b/src/vs/workbench/services/telemetry/common/workspaceStats.ts
@@ -145,33 +145,33 @@ export class WorkspaceStats {
 	}
 
 	/* __GDPR__FRAGMENT__
-	   "WorkspaceTags" : {
-		  "workbench.filesToOpen" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "workbench.filesToCreate" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "workbench.filesToDiff" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		  "workspace.roots" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.empty" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.grunt" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.gulp" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.jake" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.tsconfig" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.jsconfig" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.config.xml" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.vsc.extension" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.ASP5" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.sln" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.unity" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.npm" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.bower" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.yeoman.code.ext" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.cordova.high" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.cordova.low" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.xamarin.android" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.xamarin.ios" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.android.cpp" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
-		  "workspace.reactNative" : { "classification": "CustomerContent", "purpose": "FeatureInsight" }
-	   }
-	 */
+		"WorkspaceTags" : {
+			"workbench.filesToOpen" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"workbench.filesToCreate" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"workbench.filesToDiff" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"workspace.roots" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.empty" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.grunt" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.gulp" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.jake" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.tsconfig" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.jsconfig" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.config.xml" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.vsc.extension" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.ASP5" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.sln" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.unity" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.npm" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.bower" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.yeoman.code.ext" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.cordova.high" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.cordova.low" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.xamarin.android" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.xamarin.ios" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.android.cpp" : { "classification": "CustomerContent", "purpose": "FeatureInsight" },
+			"workspace.reactNative" : { "classification": "CustomerContent", "purpose": "FeatureInsight" }
+		}
+	*/
 	private getWorkspaceTags(configuration: IWindowConfiguration): TPromise<Tags> {
 		const tags: Tags = Object.create(null);
 
@@ -274,12 +274,12 @@ export class WorkspaceStats {
 	public reportWorkspaceTags(configuration: IWindowConfiguration): void {
 		this.getWorkspaceTags(configuration).then((tags) => {
 			/* __GDPR__
-			   "workspce.tags" : {
-				   "${include}": [
-					  "${WorkspaceTags}"
-				   ]
-			   }
-			 */
+				"workspce.tags" : {
+					"${include}": [
+						"${WorkspaceTags}"
+					]
+				}
+			*/
 			this.telemetryService.publicLog('workspce.tags', tags);
 		}, error => onUnexpectedError(error));
 	}
@@ -297,10 +297,10 @@ export class WorkspaceStats {
 			const list: string[] = [];
 			set.forEach(item => list.push(item));
 			/* __GDPR__
-			   "workspace.remotes" : {
-				  "domains" : { "classification": "CustomerContent", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"workspace.remotes" : {
+					"domains" : { "classification": "CustomerContent", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('workspace.remotes', { domains: list.sort() });
 		}, onUnexpectedError);
 	}
@@ -315,19 +315,19 @@ export class WorkspaceStats {
 			);
 		})).then(hashedRemotes => {
 			/* __GDPR__
-			   "workspace.hashedRemotes" : {
-				  "remotes" : { "classification": "CustomerContent", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"workspace.hashedRemotes" : {
+					"remotes" : { "classification": "CustomerContent", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('workspace.hashedRemotes', { remotes: hashedRemotes });
 		}, onUnexpectedError);
 	}
 
 	/* __GDPR__FRAGMENT__
-	   "AzureTags" : {
-		  "node" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	   }
-	 */
+		"AzureTags" : {
+			"node" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		}
+	*/
 	private reportAzureNode(workspaceUris: URI[], tags: Tags): TPromise<Tags> {
 		// TODO: should also work for `node_modules` folders several levels down
 		const uris = workspaceUris.map(workspaceUri => {
@@ -350,10 +350,10 @@ export class WorkspaceStats {
 
 
 	/* __GDPR__FRAGMENT__
-	   "AzureTags" : {
-		  "java" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	   }
-	 */
+		"AzureTags" : {
+			"java" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		}
+	*/
 	private reportAzureJava(workspaceUris: URI[], tags: Tags): TPromise<Tags> {
 		return TPromise.join(workspaceUris.map(workspaceUri => {
 			const path = workspaceUri.path;
@@ -377,12 +377,12 @@ export class WorkspaceStats {
 		}).then((tags) => {
 			if (Object.keys(tags).length) {
 				/* __GDPR__
-				   "workspace.azure" : {
-					   "${include}": [
-						  "${AzureTags}"
-					   ]
-				   }
-				 */
+					"workspace.azure" : {
+						"${include}": [
+							"${AzureTags}"
+						]
+					}
+				*/
 				this.telemetryService.publicLog('workspace.azure', tags);
 			}
 		}).then(null, onUnexpectedError);
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 2360ed580d5..3267637c435 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -366,14 +366,13 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	private loadWithContent(content: IRawTextContent | IContent, backup?: URI): TPromise<TextFileEditorModel> {
 		diag('load() - resolved content', this.resource, new Date());
 
-		// Telemetry
 		/* __GDPR__
-		   "fileGet" : {
-			  "mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "path": { "classification": "CustomerContent", "purpose": "FeatureInsight" }
-		   }
-		 */
+			"fileGet" : {
+				"mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"path": { "classification": "CustomerContent", "purpose": "FeatureInsight" }
+			}
+		*/
 		this.telemetryService.publicLog('fileGet', { mimeType: guessMimeTypes(this.resource.fsPath).join(', '), ext: paths.extname(this.resource.fsPath), path: anonymize(this.resource.fsPath) });
 
 		// Update our resolved disk stat model
@@ -706,16 +705,16 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 				// Telemetry
 				if (this.isSettingsFile()) {
 					/* __GDPR__
-					   "settingsWritten" : {}
-					 */
+						"settingsWritten" : {}
+					*/
 					this.telemetryService.publicLog('settingsWritten'); // Do not log write to user settings.json and .vscode folder as a filePUT event as it ruins our JSON usage data
 				} else {
 					/* __GDPR__
-					   "filePUT" : {
-						  "mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						  "ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					   }
-					 */
+						"filePUT" : {
+							"mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						}
+					*/
 					this.telemetryService.publicLog('filePUT', { mimeType: guessMimeTypes(this.resource.fsPath).join(', '), ext: paths.extname(this.lastResolvedDiskStat.resource.fsPath) });
 				}
 
diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts
index 2461fd37f5f..5dfbcde38a9 100644
--- a/src/vs/workbench/services/textfile/common/textFileService.ts
+++ b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -88,12 +88,12 @@ export abstract class TextFileService implements ITextFileService {
 		this.onConfigurationChange(configuration);
 
 		/* __GDPR__
-		   "autoSave" : {
-			   "${include}": [
-				  "${IAutoSaveConfiguration}"
-			   ]
-		   }
-		 */
+			"autoSave" : {
+				"${include}": [
+					"${IAutoSaveConfiguration}"
+				]
+			}
+		*/
 		this.telemetryService.publicLog('autoSave', this.getAutoSaveConfiguration());
 
 		this.registerListeners();
@@ -219,12 +219,12 @@ export abstract class TextFileService implements ITextFileService {
 
 			// Telemetry
 			/* __GDPR__
-			   "hotExit:triggered" : {
-				  "reason" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "windowCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				  "fileCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			   }
-			 */
+				"hotExit:triggered" : {
+					"reason" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"windowCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"fileCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
 			this.telemetryService.publicLog('hotExit:triggered', { reason, windowCount, fileCount: dirtyToBackup.length });
 
 			// Backup
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index 13427c46539..3a649cade6e 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -101,12 +101,12 @@ export interface IResult {
 }
 
 /* __GDPR__FRAGMENT__
-   "IAutoSaveConfiguration" : {
-	  "autoSaveDelay" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "autoSaveFocusChange": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-	  "autoSaveApplicationChange": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-   }
- */
+	"IAutoSaveConfiguration" : {
+		"autoSaveDelay" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"autoSaveFocusChange": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"autoSaveApplicationChange": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	}
+*/
 export interface IAutoSaveConfiguration {
 	autoSaveDelay: number;
 	autoSaveFocusChange: boolean;
diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
index c027ae8af77..7fb9b9a90c8 100644
--- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -643,14 +643,14 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 			let key = themeType + themeData.extensionId;
 			if (!this.themeExtensionsActivated.get(key)) {
 				/* __GDPR__
-				   "activatePlugin" : {
-					  "id" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-					  "name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-					  "isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					  "publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-					  "themeId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-				   }
-				 */
+					"activatePlugin" : {
+						"id" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+						"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+						"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+						"themeId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+					}
+				*/
 				this.telemetryService.publicLog('activatePlugin', {
 					id: themeData.extensionId,
 					name: themeData.extensionName,
diff --git a/src/vs/workbench/services/timer/common/timerService.ts b/src/vs/workbench/services/timer/common/timerService.ts
index 1d6c5d4f16a..0eecf662452 100644
--- a/src/vs/workbench/services/timer/common/timerService.ts
+++ b/src/vs/workbench/services/timer/common/timerService.ts
@@ -9,13 +9,13 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 export const ITimerService = createDecorator<ITimerService>('timerService');
 
 /* __GDPR__FRAGMENT__
-   "IMemoryInfo" : {
-	  "workingSetSize" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "peakWorkingSetSize": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "privateBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "sharedBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-   }
- */
+	"IMemoryInfo" : {
+		"workingSetSize" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"peakWorkingSetSize": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"privateBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"sharedBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+	}
+*/
 export interface IMemoryInfo {
 	workingSetSize: number;
 	peakWorkingSetSize: number;
@@ -24,40 +24,40 @@ export interface IMemoryInfo {
 }
 
 /* __GDPR__FRAGMENT__
-   "IStartupMetrics" : {
-	  "version" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "ellapsed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers.ellapsedAppReady" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers.ellapsedWindowLoad" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers.ellapsedWindowLoadToRequire" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers.ellapsedExtensions" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers.ellapsedExtensionsReady" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers.ellapsedRequire" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers.ellapsedViewletRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers.ellapsedEditorRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers.ellapsedWorkbench" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers.ellapsedTimersToTimersComputed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "platform" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "release" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "arch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "totalmem" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "meminfo" : { "${inline}": [ "${IMemoryInfo}" ] },
-	  "cpus.count" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "cpus.speed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "cpus.model" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "initialStartup" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "hasAccessibilitySupport" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "isVMLikelyhood" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "emptyWorkbench" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "loadavg" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "${wildcard}": [
-		 {
-			"${prefix}": "timers2.",
-			"${classification}": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-		 }
-	  ]
-   }
- */
+	"IStartupMetrics" : {
+		"version" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"ellapsed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedAppReady" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedWindowLoad" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedWindowLoadToRequire" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedExtensions" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedExtensionsReady" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedRequire" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedViewletRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedEditorRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedWorkbench" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"timers.ellapsedTimersToTimersComputed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"platform" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"release" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"arch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"totalmem" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"meminfo" : { "${inline}": [ "${IMemoryInfo}" ] },
+		"cpus.count" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"cpus.speed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"cpus.model" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"initialStartup" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"hasAccessibilitySupport" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"isVMLikelyhood" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"emptyWorkbench" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"loadavg" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+		"${wildcard}": [
+			{
+				"${prefix}": "timers2.",
+				"${classification}": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+			}
+		]
+	}
+*/
 export interface IStartupMetrics {
 	version: number;
 	ellapsed: number;