From f19a9e352b8923e693f74f942335e93defdc7e2f Mon Sep 17 00:00:00 2001
From: Alexander T <alexander.tarasyuk@outlook.com>
Date: Tue, 30 Jul 2019 14:09:31 +0300
Subject: [PATCH 1/3] fix formatting. revert type assertion

---
 src/server/editorServices.ts    | 2 +-
 src/server/protocol.ts          | 2 +-
 src/testRunner/parallel/host.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 3b1607a2aad..90b44abc48f 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -48,7 +48,7 @@ namespace ts.server {
         readonly data: ProjectInfoTelemetryEventData;
     }
 
-    /**
+    /*
      * __GDPR__
      * "projectInfo" : {
      *      "${include}": ["${TypeScriptCommonProperties}"],
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index 4c6304c11a3..00f1d8e7c6f 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -2883,7 +2883,7 @@ namespace ts.server.protocol {
         payload: TypingsInstalledTelemetryEventPayload;
     }
 
-    /**
+    /*
      * __GDPR__
      * "typingsinstalled" : {
      *     "${include}": ["${TypeScriptCommonProperties}"],
diff --git a/src/testRunner/parallel/host.ts b/src/testRunner/parallel/host.ts
index 49c9b3c66ef..dfd187d09f7 100644
--- a/src/testRunner/parallel/host.ts
+++ b/src/testRunner/parallel/host.ts
@@ -291,8 +291,8 @@ namespace Harness.Parallel.Host {
                     worker.accumulatedOutput += d.toString();
                     console.log(`[Worker ${i}]`, d.toString());
                 };
-                worker.process.stderr.on("data", appendOutput);
-                worker.process.stdout.on("data", appendOutput);
+                worker.process.stderr!.on("data", appendOutput);
+                worker.process.stdout!.on("data", appendOutput);
                 const killChild = (timeout: TaskTimeout) => {
                     worker.process.kill();
                     console.error(`Worker exceeded ${timeout.duration}ms timeout ${worker.currentTasks && worker.currentTasks.length ? `while running test '${worker.currentTasks[0].file}'.` : `during test setup.`}`);

From 771d90d4a9664008c29785ba05f97eb01b4218db Mon Sep 17 00:00:00 2001
From: Alexander T <alexander.tarasyuk@outlook.com>
Date: Tue, 30 Jul 2019 14:10:12 +0300
Subject: [PATCH 2/3] Accept new baselines

---
 tests/baselines/reference/api/tsserverlibrary.d.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index f321ebbc948..d73cbab6b5f 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -8086,15 +8086,6 @@ declare namespace ts.server.protocol {
         telemetryEventName: TypingsInstalledTelemetryEventName;
         payload: TypingsInstalledTelemetryEventPayload;
     }
-    /**
-     * __GDPR__
-     * "typingsinstalled" : {
-     *     "${include}": ["${TypeScriptCommonProperties}"],
-     *     "installedPackages": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-     *     "installSuccess": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-     *     "typingsInstallerVersion": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-     * }
-     */
     interface TypingsInstalledTelemetryEventPayload {
         /**
          * Comma separated list of installed typing packages

From 38e6e033a575de6069802f7f4be1333e2625fad5 Mon Sep 17 00:00:00 2001
From: Alexander T <alexander.tarasyuk@outlook.com>
Date: Tue, 30 Jul 2019 14:40:10 +0300
Subject: [PATCH 3/3] remove useless semicolon

---
 src/services/formatting/rules.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts
index 84bcf14e64c..d0af828b03e 100644
--- a/src/services/formatting/rules.ts
+++ b/src/services/formatting/rules.ts
@@ -457,7 +457,7 @@ namespace ts.formatting {
                 return context.currentTokenSpan.kind === SyntaxKind.EqualsToken || context.nextTokenSpan.kind === SyntaxKind.EqualsToken;
             // "in" keyword in for (let x in []) { }
             case SyntaxKind.ForInStatement:
-            // "in" keyword in [P in keyof T]: T[P];
+            // "in" keyword in [P in keyof T]: T[P]
             // falls through
             case SyntaxKind.TypeParameter:
                 return context.currentTokenSpan.kind === SyntaxKind.InKeyword || context.nextTokenSpan.kind === SyntaxKind.InKeyword || context.currentTokenSpan.kind === SyntaxKind.EqualsToken || context.nextTokenSpan.kind === SyntaxKind.EqualsToken;