Code

Merge master1128#12546

Code

Merged

mhegazy merged 33 commits intorelease-2.1microsoft/TypeScript:release-2.1from mergeMaster1128microsoft/TypeScript:mergeMaster1128Copy head branch name to clipboardNov 29, 2016

+2,665-515

Commits

Commits on Nov 19, 2016

• Allow one leading ignored “|” or “&” in a type position

  mariusschulz

  committed
  443abe5

• Add tests and accept new baselines

  mariusschulz

  committed
  e45c5db

Commits on Nov 20, 2016

• Add “|” and “&” to list of tokens that start a type

  mariusschulz

  committed
  cd70f22

• Add test for proper tuple type handling

  mariusschulz

  committed
  d040db4

Commits on Nov 24, 2016

• keyof T is a literal contextual type

  ahejlsberg

  committed
  cdda5df

• Add regression test

  ahejlsberg

  committed
  2cec4c5

• Type inference for isomorphic mapped types

  ahejlsberg

  committed
  36ad772

• doc(compiler/ts): fix documentation typo about __decorator code generation

  Show description for 7b37918
  charlypoly

  committed
  7b37918

Commits on Nov 25, 2016

• Merge pull request #12480 from Microsoft/keyofIsLiteralContext

  Show description for 5ba678a
  ahejlsberg

  authored
  5ba678a

Commits on Nov 26, 2016

• Fix multiple 'keyof' issues with 'for-in' and 'in' operator

  ahejlsberg

  committed
  46ca0ba

• Accept new baselines

  ahejlsberg

  committed
  a26a303

• Add regression test

  ahejlsberg

  committed
  12b63d2

• Include mapped types in type inference infinite recursion check

  ahejlsberg

  committed
  f2c32d2

• Add regression test

  ahejlsberg

  committed
  d1393a6

• Merge pull request #12482 from wittydeveloper/fix-generateClassElementDecorationExpression-documentation

  Show description for 5ab2fec
  mhegazy

  authored
  5ab2fec

Commits on Nov 27, 2016

• Merge pull request #12514 from Microsoft/keyofAndForIn

  Show description for 283c50c
  ahejlsberg

  authored
  283c50c

• Merge pull request #12515 from Microsoft/fixMappedTypeInference

  Show description for 88b7d53
  ahejlsberg

  authored
  88b7d53

• Merge branch 'master' into mappedTypeInference

  Show description for 0a1a3ec
  ahejlsberg

  committed
  0a1a3ec

• Reorder type inference cases

  ahejlsberg

  committed
  ecd10be

• Add tests

  ahejlsberg

  committed
  9971847

Commits on Nov 28, 2016

• Remove unused case in type inference

  ahejlsberg

  committed
  8ee5f7d

• Remove unused code in resolveMappedTypeMembers

  ahejlsberg

  committed
  9970606

• Update keyof tests to reflect #12425

  Show description for 8b7252c
  ethanresnick

  committed
  8b7252c

• Deduplicate intersection types before distributing over union types

  ahejlsberg

  committed
  3e1b443

• Add regression test

  ahejlsberg

  committed
  0be4ede

• Merge pull request #12537 from Microsoft/fixIntersectionNormalization

  Show description for 5b873fa
  ahejlsberg

  authored
  5b873fa

• getRegularTypeOfLiteralType before exhaustive switch check

  ahejlsberg

  committed
  9065b50

• Add regression test

  ahejlsberg

  committed
  2b07216

• Merge pull request #12538 from Microsoft/fixExhaustiveSwitchCheck

  Show description for 0d4beb0
  ahejlsberg

  authored
  0d4beb0

• Merge pull request #12533 from ethanresnick/keyof-tests

  Show description for 9cac35b
  mhegazy

  authored
  9cac35b

• Merge pull request #12528 from Microsoft/mappedTypeInference

  Show description for 5dd4c9e
  ahejlsberg

  authored
  5dd4c9e

• Merge pull request #12386 from mariusschulz/union-and-intersection-types-with-leading-operator

  Show description for c89b1eb
  ahejlsberg

  authored
  c89b1eb

Commits on Nov 29, 2016

• Merge branch 'master' into release-2.1

  mhegazy

  committed
  dd35a5d