From ed264aae81eb0bbe3bf4aa0dc43ec8cbf9832b5f Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Mon, 19 Aug 2019 12:38:59 -0700
Subject: [PATCH] remove some more small differences (#6791)

---
 gulpfile.js                                   |  4 +--
 jsconfig.json                                 | 27 -------------------
 .../telemetry/node/commonProperties.ts        |  6 ++---
 .../preferences/browser/settingsEditor2.ts    |  2 +-
 4 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 jsconfig.json

diff --git a/gulpfile.js b/gulpfile.js
index 1dd50f784f..96b7aad070 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -13,7 +13,7 @@ const util = require('./build/lib/util');
 const task = require('./build/lib/task');
 const path = require('path');
 const compilation = require('./build/lib/compilation');
-/*const { monacoTypecheckTask , monacoTypecheckWatchTask } = require('./build/gulpfile.editor');*/
+const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./build/gulpfile.editor');
 const { compileExtensionsTask, watchExtensionsTask } = require('./build/gulpfile.extensions');
 
 // Fast compile for development time
@@ -24,7 +24,7 @@ const watchClientTask = task.define('watch-client', task.series(util.rimraf('out
 gulp.task(watchClientTask);
 
 // All
-const compileTask = task.define('compile', task.parallel(/*monacoTypecheckTask, */compileClientTask, compileExtensionsTask));
+const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask));
 gulp.task(compileTask);
 
 gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));
diff --git a/jsconfig.json b/jsconfig.json
deleted file mode 100644
index cc73203101..0000000000
--- a/jsconfig.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	// See https://go.microsoft.com/fwlink/?LinkId=759670
-	// for the documentation about the jsconfig.json format
-	"compilerOptions": {
-		"target": "es6",
-		"module": "commonjs",
-		"allowSyntheticDefaultImports": true
-	},
-	"exclude": [
-		"src",
-		"extensions",
-		"test",
-		"i18n",
-		"out",
-		"out-build",
-		"out-vscode",
-		"out-vscode-min",
-		"out-editor",
-		"out-editor-min",
-		"out-monaco-editor-core",
-		"resources",
-		"scripts",
-		".build",
-		"node_modules",
-		"build/monaco/node_modules"
-	]
-}
diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts
index 6fa9d1ee28..54f168d766 100644
--- a/src/vs/platform/telemetry/node/commonProperties.ts
+++ b/src/vs/platform/telemetry/node/commonProperties.ts
@@ -17,13 +17,11 @@ export async function resolveCommonProperties(commit: string | undefined, versio
 
 	// {{SQL CARBON EDIT}}
 	// __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
-	// result['common.machineId'] = machineId;
 	result['common.machineId'] = '';
-	// // __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	// result['sessionID'] = uuid.generateUuid() + Date.now();
+	// __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['sessionID'] = '';
 
-	// __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	// __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 	result['commitHash'] = '';
 	// __GDPR__COMMON__ "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['version'] = version;
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index b01c9291cc..e90005c62f 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -262,7 +262,7 @@ export class SettingsEditor2 extends BaseEditor {
 	}
 
 	private _setOptions(options: SettingsEditorOptions): void {
-		// {{SQL CARBON EDIT}} - return if options is undefined to avoid nullref
+		// {{SQL CARBON EDIT}} - return if options is undefined to avoid nullref @todo anthonydresser 8/17/19 investigate
 		if (!options) {
 			return;
 		}