PR feedback and remove remainind id() uses

Author: Andy Hanson

src/compiler/core.ts

@@ -2595,12 +2595,4 @@ namespace ts {
     export function isCheckJsEnabledForFile(sourceFile: SourceFile, compilerOptions: CompilerOptions) {
         return sourceFile.checkJsDirective ? sourceFile.checkJsDirective.enabled : compilerOptions.checkJs;
     }
-
-    /**
-     * The identity function.
-     * Also useful to provide a contextual type for an object literal.
-     */
-    export function id<T>(value: T) {
-        return value;
-    }
 }

src/compiler/emitter.ts

@@ -1195,7 +1195,9 @@ namespace ts {
             if (!(getEmitFlags(node) & EmitFlags.NoIndentation)) {
                 const dotRangeStart = node.expression.end;
                 const dotRangeEnd = skipTrivia(currentSourceFile.text, node.expression.end) + 1;
-                const dotToken = <Node>{ kind: SyntaxKind.DotToken, pos: dotRangeStart, end: dotRangeEnd }; // tslint:disable-line no-object-literal-type-assertion
+                const dotToken = createToken(SyntaxKind.DotToken);
+                dotToken.pos = dotRangeStart;
+                dotToken.end = dotRangeEnd;
                 indentBeforeDot = needsIndentation(node, node.expression, dotToken);
                 indentAfterDot = needsIndentation(node, dotToken, node.name);
             }

src/harness/unittests/compileOnSave.ts

@@ -518,18 +518,20 @@ namespace ts.projectSystem {
                 };
                 const host = createServerHost([f], { newLine });
                 const session = createSession(host);
-                session.executeCommand(id<server.protocol.OpenRequest>({
+                const openRequest: server.protocol.OpenRequest = {
                     seq: 1,
                     type: "request",
                     command: server.protocol.CommandTypes.Open,
                     arguments: { file: f.path }
-                }));
-                session.executeCommand(id<server.protocol.CompileOnSaveEmitFileRequest>({
+                };
+                session.executeCommand(openRequest);
+                const emitFileRequest: server.protocol.CompileOnSaveEmitFileRequest = {
                     seq: 2,
                     type: "request",
                     command: server.protocol.CommandTypes.CompileOnSaveEmitFile,
                     arguments: { file: f.path }
-                }));
+                };
+                session.executeCommand(emitFileRequest);
                 const emitOutput = host.readFile(path + ts.Extension.Js);
                 assert.equal(emitOutput, f.content + newLine, "content of emit output should be identical with the input + newline");
             }

src/harness/unittests/matchFiles.ts

@@ -110,7 +110,7 @@ namespace ts {
         }
         {
             const actual = ts.parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack);
-            expected.errors = expected.errors.map((error): Diagnostic => ({
+            expected.errors = expected.errors.map<Diagnostic>(error => ({
                 category: error.category,
                 code: error.code,
                 file: undefined,

src/server/editorServices.ts

@@ -441,10 +441,11 @@ namespace ts.server {
             if (!this.eventHandler) {
                 return;
             }
-            this.eventHandler(id<ProjectLanguageServiceStateEvent>({
+            const event: ProjectLanguageServiceStateEvent = {
                 eventName: ProjectLanguageServiceStateEvent,
                 data: { project, languageServiceEnabled }
-            }));
+            };
+            this.eventHandler(event);
         }
 
         updateTypingsForProject(response: SetTypings | InvalidateCachedTypings): void {
@@ -602,10 +603,11 @@ namespace ts.server {
                 }
 
                 for (const openFile of this.openFiles) {
-                    this.eventHandler(id<ContextEvent>({
+                    const event: ContextEvent = {
                         eventName: ContextEvent,
                         data: { project: openFile.getDefaultProject(), fileName: openFile.fileName }
-                    }));
+                    };
+                    this.eventHandler(event);
                 }
             }
 
@@ -1107,10 +1109,11 @@ namespace ts.server {
                 return;
             }
 
-            this.eventHandler(id<ConfigFileDiagEvent>({
+            const event: ConfigFileDiagEvent = {
                 eventName: ConfigFileDiagEvent,
                 data: { configFileName, diagnostics: diagnostics || [], triggerFile }
-            }));
+            };
+            this.eventHandler(event);
         }
 
         private createAndAddConfiguredProject(configFileName: NormalizedPath, projectOptions: ProjectOptions, configFileErrors: Diagnostic[], clientFileName?: string) {

src/server/session.ts

@@ -539,8 +539,8 @@ namespace ts.server {
                 );
         }
 
-        private convertToDiagnosticsWithLinePositionFromDiagnosticFile(diagnostics: Diagnostic[]): protocol.DiagnosticWithLinePosition[] {
-            return diagnostics.map(d => ({
+        private convertToDiagnosticsWithLinePositionFromDiagnosticFile(diagnostics: Diagnostic[]) {
+            return diagnostics.map<protocol.DiagnosticWithLinePosition>(d => ({
                 message: flattenDiagnosticMessageText(d.messageText, this.host.newLine),
                 start: d.start,
                 length: d.length,

src/server/typingsInstaller/typingsInstaller.ts

@@ -356,14 +356,15 @@ namespace ts.server.typingsInstaller {
                     this.sendResponse(this.createSetTypings(req, currentlyCachedTypings.concat(installedTypingFiles)));
                 }
                 finally {
-                    this.sendResponse(id<EndInstallTypes>({
+                    const response: EndInstallTypes = {
                         kind: EventEndInstallTypes,
                         eventId: requestId,
                         projectName: req.projectName,
                         packagesToInstall: scopedTypings,
                         installSuccess: ok,
                         typingsInstallerVersion: ts.version // qualified explicitly to prevent occasional shadowing
-                    }));
+                    };
+                    this.sendResponse(response);
                 }
             });
         }