From 1ca17aba260367bb56a0b1bc65ddd1ca5bef9265 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa@umich.edu>
Date: Fri, 17 Jul 2015 11:20:51 -0700
Subject: [PATCH] Addressed Daniel's Comments

---
 src/services/services.ts | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/services/services.ts b/src/services/services.ts
index 71dc03f35ce..0efab7ca149 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -260,30 +260,25 @@ namespace ts {
         }
 
         public getFirstToken(sourceFile?: SourceFile): Node {
-            let children = this.getChildren(); // why isn't sourceFile passed as an argument??
-            if (!(children && children.length > 0)) { return undefined; }
+            let children = this.getChildren(sourceFile);
+            if (!(children.length > 0)) {
+                return undefined;
+            }
 
             let child = children[0];
 
-            if (child.kind < SyntaxKind.FirstNode) {
-                return child;
-            }
-
-            return child.getFirstToken(sourceFile);
+            return child.kind < SyntaxKind.FirstNode ? child : child.getFirstToken(sourceFile);
         }
 
         public getLastToken(sourceFile?: SourceFile): Node {
             let children = this.getChildren(sourceFile);
-            if (!children) { return undefined; }
 
             let child = lastOrUndefined(children);
-            if (!child) { return undefined; }
-
-            if (child.kind < SyntaxKind.FirstNode) {
-                return child;
+            if (!child) { 
+                return undefined; 
             }
 
-            return child.getLastToken(sourceFile);
+            return child.kind < SyntaxKind.FirstNode ? child : child.getLastToken(sourceFile);
         }
     }