Merge branch 'feature/eslint' of https://github.com/a-tarasyuk/TypeScript into feature/eslint

src/server/editorServices.ts

@@ -48,7 +48,7 @@ namespace ts.server {
         readonly data: ProjectInfoTelemetryEventData;
     }
 
-    /**
+    /*
      * __GDPR__
      * "projectInfo" : {
      *      "${include}": ["${TypeScriptCommonProperties}"],

src/server/protocol.ts

@@ -2883,7 +2883,7 @@ namespace ts.server.protocol {
         payload: TypingsInstalledTelemetryEventPayload;
     }
 
-    /**
+    /*
      * __GDPR__
      * "typingsinstalled" : {
      *     "${include}": ["${TypeScriptCommonProperties}"],

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;

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