From ec4278972d8cdc949571017b063b7180c0016c3f Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 18 Mar 2015 12:08:09 -0700
Subject: [PATCH] Addressed CR feedback.

---
 src/services/services.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/services/services.ts b/src/services/services.ts
index f5b9e36f59b..f549bce6bd5 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2618,9 +2618,13 @@ module ts {
                 entries: activeCompletionSession.entries
             };
 
+            /**
+             * Finds the first node that "embraces" the position, so that one may
+             * accurately aggregate locals from the closest containing scope.
+             */
             function getScopeNode(initialToken: Node, position: number, sourceFile: SourceFile) {
                 var scope = initialToken;
-                while (scope && (isToken(scope) || !positionBelongsToNode(scope, position, sourceFile))) {
+                while (scope && !positionBelongsToNode(scope, position, sourceFile)) {
                     scope = scope.parent;
                 }
                 return scope;