From 5cbf667d787a18c09e762c2dbc77eb7e042ae6cd Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 18 Mar 2015 14:07:42 -0700
Subject: [PATCH] Fixed the contextual check for modifiers to check the
 original modifier instead of the flags of the node.

---
 src/services/services.ts  | 19 ++++---------------
 src/services/utilities.ts | 11 +++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/services/services.ts b/src/services/services.ts
index 1bf5f6336d4..dbddcc939a1 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -4011,18 +4011,18 @@ module ts {
                 let container = declaration.parent;
 
                 // Make sure we only highlight the keyword when it makes sense to do so.
-                if (declaration.flags & NodeFlags.AccessibilityModifier) {
+                if (isAccessibilityModifier(modifier)) {
                     if (!(container.kind === SyntaxKind.ClassDeclaration ||
                         (declaration.kind === SyntaxKind.Parameter && hasKind(container, SyntaxKind.Constructor)))) {
                         return undefined;
                     }
                 }
-                else if (declaration.flags & NodeFlags.Static) {
+                else if (modifier === SyntaxKind.StaticKeyword) {
                     if (container.kind !== SyntaxKind.ClassDeclaration) {
                         return undefined;
                     }
                 }
-                else if (declaration.flags & (NodeFlags.Export | NodeFlags.Ambient)) {
+                else if (modifier === SyntaxKind.ExportKeyword || modifier === SyntaxKind.DeclareKeyword) {
                     if (!(container.kind === SyntaxKind.ModuleBlock || container.kind === SyntaxKind.SourceFile)) {
                         return undefined;
                     }
@@ -4063,7 +4063,7 @@ module ts {
                     default:
                         Debug.fail("Invalid container kind.")
                 }
-
+                
                 forEach(nodes, node => {
                     if (node.modifiers && node.flags & modifierFlag) {
                         forEach(node.modifiers, child => pushKeywordIf(keywords, child, modifier));
@@ -5843,17 +5843,6 @@ module ts {
         //     a string literal, and a template end consisting of '} } `'.
         let templateStack: SyntaxKind[] = [];
 
-        function isAccessibilityModifier(kind: SyntaxKind) {
-            switch (kind) {
-                case SyntaxKind.PublicKeyword:
-                case SyntaxKind.PrivateKeyword:
-                case SyntaxKind.ProtectedKeyword:
-                    return true;
-            }
-
-            return false;
-        }
-
         /** Returns true if 'keyword2' can legally follow 'keyword1' in any language construct. */
         function canFollow(keyword1: SyntaxKind, keyword2: SyntaxKind) {
             if (isAccessibilityModifier(keyword1)) {
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 7671ee3f88d..6f7957cb4ea 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -320,6 +320,17 @@ module ts {
             && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd());
     }
 
+    export function isAccessibilityModifier(kind: SyntaxKind) {
+        switch (kind) {
+            case SyntaxKind.PublicKeyword:
+            case SyntaxKind.PrivateKeyword:
+            case SyntaxKind.ProtectedKeyword:
+                return true;
+        }
+
+        return false;
+    }
+
     export function compareDataObjects(dst: any, src: any): boolean {
         for (let e in dst) {
             if (typeof dst[e] === "object") {