Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Type inference in conditional types #21496

Merged
merged 66 commits into from Feb 3, 2018
Merged

Type inference in conditional types #21496

merged 66 commits into from Feb 3, 2018

Commits on Dec 5, 2017

  1. Copy the full SHA
    57ca768 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2017

  1. Copy the full SHA
    063eed1 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2017

  1. Copy the full SHA
    ec2bdfd View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    43e195d View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2017

  1. Copy the full SHA
    61225cc View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    9f74a7a View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    20434fa View commit details
    Browse the repository at this point in the history
  4. Fix typo

    ahejlsberg committed Dec 13, 2017
    Copy the full SHA
    ddc631c View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    000f121 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2017

  1. Copy the full SHA
    27b945b View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2017

  1. Accept new baselines

    ahejlsberg committed Dec 17, 2017
    Copy the full SHA
    f59e2e6 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2017

  1. Copy the full SHA
    14590f1 View commit details
    Browse the repository at this point in the history
  2. Accept new baselines

    ahejlsberg committed Dec 18, 2017
    Copy the full SHA
    100e4f6 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2017

  1. Copy the full SHA
    c5fd2f1 View commit details
    Browse the repository at this point in the history
  2. Accept new baselines

    ahejlsberg committed Dec 19, 2017
    Copy the full SHA
    341c397 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2017

  1. Fix linting error

    ahejlsberg committed Dec 20, 2017
    Copy the full SHA
    3f4911f View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2018

  1. Merge branch 'master' into conditionalTypes

    # Conflicts:
    #	src/compiler/checker.ts
    ahejlsberg committed Jan 3, 2018
    Copy the full SHA
    abc8110 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    bb23bb2 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2018

  1. Copy the full SHA
    c10a552 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2018

  1. Copy the full SHA
    53b1572 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    5094f76 View commit details
    Browse the repository at this point in the history
  3. Accept new baselines

    ahejlsberg committed Jan 15, 2018
    Copy the full SHA
    925da86 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    e8d1740 View commit details
    Browse the repository at this point in the history
  5. Accept new baselines

    ahejlsberg committed Jan 15, 2018
    Copy the full SHA
    15baf0e View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    9598acd View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2018

  1. Copy the full SHA
    e96ec8c View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    d52fa71 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2018

  1. Merge branch 'master' into conditionalTypes

    # Conflicts:
    #	src/compiler/checker.ts
    #	src/compiler/types.ts
    #	tests/baselines/reference/api/tsserverlibrary.d.ts
    #	tests/baselines/reference/api/typescript.d.ts
    ahejlsberg committed Jan 17, 2018
    Copy the full SHA
    4ec6fdd View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2018

  1. Copy the full SHA
    fd0dd6e View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2018

  1. Fix parsing

    ahejlsberg committed Jan 19, 2018
    Copy the full SHA
    c360c24 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    0e73240 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2018

  1. Copy the full SHA
    5204fd5 View commit details
    Browse the repository at this point in the history
  2. Add tests

    ahejlsberg committed Jan 20, 2018
    Copy the full SHA
    eb314d0 View commit details
    Browse the repository at this point in the history
  3. Accept new baselines

    ahejlsberg committed Jan 20, 2018
    Copy the full SHA
    cdd50d4 View commit details
    Browse the repository at this point in the history
  4. Revise comments

    ahejlsberg committed Jan 20, 2018
    Copy the full SHA
    fc7d1c3 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    f19959a View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2018

  1. Copy the full SHA
    b869290 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    4c7ec3c View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. Copy the full SHA
    b42c6b1 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    8e337b5 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2018

  1. Copy the full SHA
    d608941 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    490d656 View commit details
    Browse the repository at this point in the history
  3. Accept new baselines

    ahejlsberg committed Jan 25, 2018
    Copy the full SHA
    4d62df4 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    ef0c3b7 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    f59f3a2 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. Copy the full SHA
    60c9249 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    e450212 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    fa6c4b7 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2018

  1. Copy the full SHA
    edffb12 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2018

  1. Copy the full SHA
    c6f0dfb View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    4f2b5f3 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    f990e4e View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    01516c8 View commit details
    Browse the repository at this point in the history
  5. Add tests

    ahejlsberg committed Jan 30, 2018
    Copy the full SHA
    34505c1 View commit details
    Browse the repository at this point in the history
  6. Accept new baselines

    ahejlsberg committed Jan 30, 2018
    Copy the full SHA
    03a3847 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'conditionalTypes' into inferTypes

    # Conflicts:
    #	src/compiler/checker.ts
    #	tests/cases/fourslash/completionInJSDocFunctionNew.ts
    #	tests/cases/fourslash/completionInJSDocFunctionThis.ts
    ahejlsberg committed Jan 30, 2018
    Copy the full SHA
    7c241ba View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2018

  1. Copy the full SHA
    5702f61 View commit details
    Browse the repository at this point in the history
  2. Accept new baselines

    ahejlsberg committed Jan 31, 2018
    Copy the full SHA
    1275a20 View commit details
    Browse the repository at this point in the history
  3. Add more error case checks

    ahejlsberg committed Jan 31, 2018
    Copy the full SHA
    afec056 View commit details
    Browse the repository at this point in the history
  4. Accept new baselines

    ahejlsberg committed Jan 31, 2018
    Copy the full SHA
    36a49ad View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2018

  1. Merge branch 'master' into conditionalTypes

    # Conflicts:
    #	src/compiler/checker.ts
    ahejlsberg committed Feb 3, 2018
    Copy the full SHA
    d4dc67a View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    7034d67 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    7bb8cfe View commit details
    Browse the repository at this point in the history
  4. Add tests

    ahejlsberg committed Feb 3, 2018
    Copy the full SHA
    a712344 View commit details
    Browse the repository at this point in the history
  5. Accept new baselines

    ahejlsberg committed Feb 3, 2018
    Copy the full SHA
    04260d6 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    4ae8445 View commit details
    Browse the repository at this point in the history