Merge branch 'master' into libReferenceDirective

microsoft · rbuckton · May 11, 2017 · May 11, 2017 · May 12, 2017 · May 13, 2017
commit 8a7abbfd0c95faa2b2028fbe4194dc31f75a35cf
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -4255,6 +4255,29 @@ namespace ts {
         return options.watch && options.hasOwnProperty("watch");
     }
 
+    export function getCheckFlags(symbol: Symbol): CheckFlags {
+        return symbol.flags & SymbolFlags.Transient ? (<TransientSymbol>symbol).checkFlags : 0;
+    }
+
+    export function getDeclarationModifierFlagsFromSymbol(s: Symbol): ModifierFlags {
+        if (s.valueDeclaration) {
+            const flags = getCombinedModifierFlags(s.valueDeclaration);
+            return s.parent && s.parent.flags & SymbolFlags.Class ? flags : flags & ~ModifierFlags.AccessibilityModifier;
+        }
+        if (getCheckFlags(s) & CheckFlags.Synthetic) {
+            const checkFlags = (<TransientSymbol>s).checkFlags;
+            const accessModifier = checkFlags & CheckFlags.ContainsPrivate ? ModifierFlags.Private :
+                checkFlags & CheckFlags.ContainsPublic ? ModifierFlags.Public :
+                    ModifierFlags.Protected;
+            const staticModifier = checkFlags & CheckFlags.ContainsStatic ? ModifierFlags.Static : 0;
+            return accessModifier | staticModifier;
+        }
+        if (s.flags & SymbolFlags.Prototype) {
+            return ModifierFlags.Public | ModifierFlags.Static;
+        }
+        return 0;
+    }
+
     /**
      * Given a name and a list of names are *not* equal to the name, return a spelling suggestion if there is one that is close enough.
      * Names less than length 3 only check for case-insensitive equality, not Levenshtein distance.