Merge branch 'master' of https://github.com/Microsoft/TypeScript into destructuringFixes

Conflicts:	src/compiler/utilities.ts

Author: JsonFreeman

bin/tsc.js

@@ -124,16 +124,16 @@ declare module "typescript" {
  VoidKeyword = 99,
  WhileKeyword = 100,
  WithKeyword = 101,
- AsKeyword = 102,
- ImplementsKeyword = 103,
- InterfaceKeyword = 104,
- LetKeyword = 105,
- PackageKeyword = 106,
- PrivateKeyword = 107,
- ProtectedKeyword = 108,
- PublicKeyword = 109,
- StaticKeyword = 110,
- YieldKeyword = 111,
+ ImplementsKeyword = 102,
+ InterfaceKeyword = 103,
+ LetKeyword = 104,
+ PackageKeyword = 105,
+ PrivateKeyword = 106,
+ ProtectedKeyword = 107,
+ PublicKeyword = 108,
+ StaticKeyword = 109,
+ YieldKeyword = 110,
+ AsKeyword = 111,
  AnyKeyword = 112,
  BooleanKeyword = 113,
  ConstructorKeyword = 114,
@@ -258,8 +258,8 @@ declare module "typescript" {
  LastReservedWord = 101,
  FirstKeyword = 66,
  LastKeyword = 125,
- FirstFutureReservedWord = 103,
- LastFutureReservedWord = 111,
+ FirstFutureReservedWord = 102,
+ LastFutureReservedWord = 110,
  FirstTypeNode = 141,
  LastTypeNode = 149,
  FirstPunctuation = 14,
@@ -310,6 +310,7 @@ declare module "typescript" {
  }
  interface Identifier extends PrimaryExpression {
  text: string;
+ originalKeywordKind?: SyntaxKind;
  }
  interface QualifiedName extends Node {
  left: EntityName;
@@ -1181,6 +1182,34 @@ declare module "typescript" {
  function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;
  function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;
 }
+declare module "typescript" {
+ function getDefaultLibFileName(options: CompilerOptions): string;
+ function textSpanEnd(span: TextSpan): number;
+ function textSpanIsEmpty(span: TextSpan): boolean;
+ function textSpanContainsPosition(span: TextSpan, position: number): boolean;
+ function textSpanContainsTextSpan(span: TextSpan, other: TextSpan): boolean;
+ function textSpanOverlapsWith(span: TextSpan, other: TextSpan): boolean;
+ function textSpanOverlap(span1: TextSpan, span2: TextSpan): TextSpan;
+ function textSpanIntersectsWithTextSpan(span: TextSpan, other: TextSpan): boolean;
+ function textSpanIntersectsWith(span: TextSpan, start: number, length: number): boolean;
+ function textSpanIntersectsWithPosition(span: TextSpan, position: number): boolean;
+ function textSpanIntersection(span1: TextSpan, span2: TextSpan): TextSpan;
+ function createTextSpan(start: number, length: number): TextSpan;
+ function createTextSpanFromBounds(start: number, end: number): TextSpan;
+ function textChangeRangeNewSpan(range: TextChangeRange): TextSpan;
+ function textChangeRangeIsUnchanged(range: TextChangeRange): boolean;
+ function createTextChangeRange(span: TextSpan, newLength: number): TextChangeRange;
+ let unchangedTextChangeRange: TextChangeRange;
+ /**
+ * Called to merge all the changes that occurred across several versions of a script snapshot
+ * into a single change. i.e. if a user keeps making successive edits to a script we will
+ * have a text change from V1 to V2, V2 to V3, ..., Vn.
+ *
+ * This function will then merge those changes into a single change range valid between V1 and
+ * Vn.
+ */
+ function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
+}
 declare module "typescript" {
  function getNodeConstructor(kind: SyntaxKind): new () => Node;
  function createNode(kind: SyntaxKind): Node;
@@ -1260,7 +1289,6 @@ declare module "typescript" {
  getDocumentationComment(): SymbolDisplayPart[];
  }
  interface SourceFile {
- getNamedDeclarations(): Declaration[];
  getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
  getLineStarts(): number[];
  getPositionOfLineAndCharacter(line: number, character: number): number;

bin/tsserver.js

@@ -124,16 +124,16 @@ declare module ts {
  VoidKeyword = 99,
  WhileKeyword = 100,
  WithKeyword = 101,
- AsKeyword = 102,
- ImplementsKeyword = 103,
- InterfaceKeyword = 104,
- LetKeyword = 105,
- PackageKeyword = 106,
- PrivateKeyword = 107,
- ProtectedKeyword = 108,
- PublicKeyword = 109,
- StaticKeyword = 110,
- YieldKeyword = 111,
+ ImplementsKeyword = 102,
+ InterfaceKeyword = 103,
+ LetKeyword = 104,
+ PackageKeyword = 105,
+ PrivateKeyword = 106,
+ ProtectedKeyword = 107,
+ PublicKeyword = 108,
+ StaticKeyword = 109,
+ YieldKeyword = 110,
+ AsKeyword = 111,
  AnyKeyword = 112,
  BooleanKeyword = 113,
  ConstructorKeyword = 114,
@@ -258,8 +258,8 @@ declare module ts {
  LastReservedWord = 101,
  FirstKeyword = 66,
  LastKeyword = 125,
- FirstFutureReservedWord = 103,
- LastFutureReservedWord = 111,
+ FirstFutureReservedWord = 102,
+ LastFutureReservedWord = 110,
  FirstTypeNode = 141,
  LastTypeNode = 149,
  FirstPunctuation = 14,
@@ -310,6 +310,7 @@ declare module ts {
  }
  interface Identifier extends PrimaryExpression {
  text: string;
+ originalKeywordKind?: SyntaxKind;
  }
  interface QualifiedName extends Node {
  left: EntityName;
@@ -1181,6 +1182,34 @@ declare module ts {
  function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;
  function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;
 }
+declare module ts {
+ function getDefaultLibFileName(options: CompilerOptions): string;
+ function textSpanEnd(span: TextSpan): number;
+ function textSpanIsEmpty(span: TextSpan): boolean;
+ function textSpanContainsPosition(span: TextSpan, position: number): boolean;
+ function textSpanContainsTextSpan(span: TextSpan, other: TextSpan): boolean;
+ function textSpanOverlapsWith(span: TextSpan, other: TextSpan): boolean;
+ function textSpanOverlap(span1: TextSpan, span2: TextSpan): TextSpan;
+ function textSpanIntersectsWithTextSpan(span: TextSpan, other: TextSpan): boolean;
+ function textSpanIntersectsWith(span: TextSpan, start: number, length: number): boolean;
+ function textSpanIntersectsWithPosition(span: TextSpan, position: number): boolean;
+ function textSpanIntersection(span1: TextSpan, span2: TextSpan): TextSpan;
+ function createTextSpan(start: number, length: number): TextSpan;
+ function createTextSpanFromBounds(start: number, end: number): TextSpan;
+ function textChangeRangeNewSpan(range: TextChangeRange): TextSpan;
+ function textChangeRangeIsUnchanged(range: TextChangeRange): boolean;
+ function createTextChangeRange(span: TextSpan, newLength: number): TextChangeRange;
+ let unchangedTextChangeRange: TextChangeRange;
+ /**
+ * Called to merge all the changes that occurred across several versions of a script snapshot
+ * into a single change. i.e. if a user keeps making successive edits to a script we will
+ * have a text change from V1 to V2, V2 to V3, ..., Vn.
+ *
+ * This function will then merge those changes into a single change range valid between V1 and
+ * Vn.
+ */
+ function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
+}
 declare module ts {
  function getNodeConstructor(kind: SyntaxKind): new () => Node;
  function createNode(kind: SyntaxKind): Node;
@@ -1260,7 +1289,6 @@ declare module ts {
  getDocumentationComment(): SymbolDisplayPart[];
  }
  interface SourceFile {
- getNamedDeclarations(): Declaration[];
  getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
  getLineStarts(): number[];
  getPositionOfLineAndCharacter(line: number, character: number): number;