From b6e8dd49e4bc5d74ff5c8dae171be72d82fe10b8 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 10 Dec 2014 17:34:17 -0800
Subject: [PATCH] Responded to CR feedback.

---
 src/compiler/parser.ts    | 7 ++++---
 src/compiler/utilities.ts | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index cdfb09e19ec..66ed2c312fd 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -323,7 +323,9 @@ module ts {
                 sys.writeFile(fileName, data, writeByteOrderMark);
             }
             catch (e) {
-                if (onError) onError(e.message);
+                if (onError) {
+                    onError(e.message);
+                }
             }
         }
 
@@ -405,14 +407,13 @@ module ts {
 
     function isEvalOrArgumentsIdentifier(node: Node): boolean {
         return node.kind === SyntaxKind.Identifier &&
-            (<Identifier>node).text &&
             ((<Identifier>node).text === "eval" || (<Identifier>node).text === "arguments");
     }
 
     /// Should be called only on prologue directives (isPrologueDirective(node) should be true)
     function isUseStrictPrologueDirective(node: Node): boolean {
         Debug.assert(isPrologueDirective(node));
-        return (<Identifier>(<ExpressionStatement>node).expression).text === "use strict";
+        return getTextOfNode((<ExpressionStatement>node).expression) === '"use strict"';
     }
 
     export function createSourceFile(filename: string, sourceText: string, languageVersion: ScriptTarget, version: string, isOpen: boolean = false): SourceFile {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index c3e067b7e75..fb88b818917 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -90,7 +90,9 @@ module ts {
     }
 
     export function getSourceFileOfNode(node: Node): SourceFile {
-        while (node && node.kind !== SyntaxKind.SourceFile) node = node.parent;
+        while (node && node.kind !== SyntaxKind.SourceFile) {
+            node = node.parent;
+        }
         return <SourceFile>node;
     }
 
@@ -161,7 +163,7 @@ module ts {
         node = getErrorSpanForNode(node);
         var file = getSourceFileOfNode(node);
 
-        var start = getFullWidth(node) === 0 ? node.pos : skipTrivia(file.text, node.pos);
+        var start = getTokenPosOfNode(node, file);
         var length = node.end - start;
 
         return createFileDiagnostic(file, start, length, message, arg0, arg1, arg2);