Merge pull request microsoft#2475 from Microsoft/completionEntryDetails

Share code between getCompletionsAtPosition and getCompletionEntryDetails.

Author: CyrusNajmabadi

src/compiler/checker.ts

@@ -10587,15 +10587,64 @@ module ts {
  function getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[] {
  let symbols: SymbolTable = {};
  let memberFlags: NodeFlags = 0;
- function copySymbol(symbol: Symbol, meaning: SymbolFlags) {
+
+ if (isInsideWithStatementBody(location)) {
+ // We cannot answer semantic questions within a with block, do not proceed any further
+ return [];
+ }
+
+ populateSymbols();
+
+ return mapToArray(symbols);
+
+ function populateSymbols() {
+ while (location) {
+ if (location.locals && !isGlobalSourceFile(location)) {
+ copySymbols(location.locals, meaning);
+ }
+
+ switch (location.kind) {
+ case SyntaxKind.SourceFile:
+ if (!isExternalModule(<SourceFile>location)) {
+ break;
+ }
+ case SyntaxKind.ModuleDeclaration:
+ copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.ModuleMember);
+ break;
+ case SyntaxKind.EnumDeclaration:
+ copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.EnumMember);
+ break;
+ case SyntaxKind.ClassDeclaration:
+ case SyntaxKind.InterfaceDeclaration:
+ if (!(memberFlags & NodeFlags.Static)) {
+ copySymbols(getSymbolOfNode(location).members, meaning & SymbolFlags.Type);
+ }
+ break;
+ case SyntaxKind.FunctionExpression:
+ if ((<FunctionExpression>location).name) {
+ copySymbol(location.symbol, meaning);
+ }
+ break;
+ }
+
+ memberFlags = location.flags;
+ location = location.parent;
+ }
+
+ copySymbols(globals, meaning);
+ }
+
+ // Returns 'true' if we should stop processing symbols.
+ function copySymbol(symbol: Symbol, meaning: SymbolFlags): void {
  if (symbol.flags & meaning) {
  let id = symbol.name;
  if (!isReservedMemberName(id) && !hasProperty(symbols, id)) {
  symbols[id] = symbol;
  }
  }
  }
- function copySymbols(source: SymbolTable, meaning: SymbolFlags) {
+
+ function copySymbols(source: SymbolTable, meaning: SymbolFlags): void {
  if (meaning) {
  for (let id in source) {
  if (hasProperty(source, id)) {
@@ -10604,42 +10653,6 @@ module ts {
  }
  }
  }
-
- if (isInsideWithStatementBody(location)) {
- // We cannot answer semantic questions within a with block, do not proceed any further
- return [];
- }
-
- while (location) {
- if (location.locals && !isGlobalSourceFile(location)) {
- copySymbols(location.locals, meaning);
- }
- switch (location.kind) {
- case SyntaxKind.SourceFile:
- if (!isExternalModule(<SourceFile>location)) break;
- case SyntaxKind.ModuleDeclaration:
- copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.ModuleMember);
- break;
- case SyntaxKind.EnumDeclaration:
- copySymbols(getSymbolOfNode(location).exports, meaning & SymbolFlags.EnumMember);
- break;
- case SyntaxKind.ClassDeclaration:
- case SyntaxKind.InterfaceDeclaration:
- if (!(memberFlags & NodeFlags.Static)) {
- copySymbols(getSymbolOfNode(location).members, meaning & SymbolFlags.Type);
- }
- break;
- case SyntaxKind.FunctionExpression:
- if ((<FunctionExpression>location).name) {
- copySymbol(location.symbol, meaning);
- }
- break;
- }
- memberFlags = location.flags;
- location = location.parent;
- }
- copySymbols(globals, meaning);
- return mapToArray(symbols);
  }
 
  function isTypeDeclarationName(name: Node): boolean {

src/compiler/scanner.ts

@@ -256,6 +256,11 @@ module ts {
  return tokenStrings[t];
  }
 
+ /* @internal */
+ export function stringToToken(s: string): SyntaxKind {
+ return textToToken[s];
+ }
+
  export function computeLineStarts(text: string): number[] {
  let result: number[] = new Array();
  let pos = 0;

src/compiler/types.ts

@@ -1092,6 +1092,9 @@ module ts {
  getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
  getIndexTypeOfType(type: Type, kind: IndexKind): Type;
  getReturnTypeOfSignature(signature: Signature): Type;
+
+ // If 'predicate' is supplied, then only the first symbol in scope matching the predicate 
+ // will be returned. Otherwise, all symbols in scope will be returned.
  getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
  getSymbolAtLocation(node: Node): Symbol;
  getShorthandAssignmentValueSymbol(location: Node): Symbol;