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

Union Types #824

Merged
merged 31 commits into from
Oct 13, 2014
Merged

Union Types #824

merged 31 commits into from
Oct 13, 2014

Commits on Oct 4, 2014

  1. 51 Configuration menu
    Copy the full SHA
    e836fe1 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2014

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

Commits on Oct 8, 2014

  1. 2 Configuration menu
    Copy the full SHA
    b8923b3 View commit details
    Browse the repository at this point in the history
  2. add test for quick info

    mhegazy committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    5669f63 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c439ae4 View commit details
    Browse the repository at this point in the history
  4. Addressing CR feedback

    ahejlsberg committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    95584e9 View commit details
    Browse the repository at this point in the history
  5. Accepting new baselines

    The new baselines all look correct to me, but obviously a number of the
    tests need to be updated to reflect union types and the new behavior of
    best common type. This commit does not cover that.
    ahejlsberg committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    fd5b808 View commit details
    Browse the repository at this point in the history
  6. 8 Configuration menu
    Copy the full SHA
    3a17b02 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    ea4cbbe View commit details
    Browse the repository at this point in the history
  8. Accepting new baselines after merge with master

    The tuple type tests from master need to be updated to reflect the new
    best common type behavior from union types. This commit simply accepts
    the baselines as they are.
    ahejlsberg committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    5c661ba View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2014

  1. 2 Configuration menu
    Copy the full SHA
    779db6e View commit details
    Browse the repository at this point in the history
  2. 1 Configuration menu
    Copy the full SHA
    2eb51ab View commit details
    Browse the repository at this point in the history
  3. Merge branch 'unionTypes' into unionTypesLS

    Conflicts:
    	src/compiler/checker.ts
    	src/services/services.ts
    mhegazy committed Oct 9, 2014
    Configuration menu
    Copy the full SHA
    dc43e83 View commit details
    Browse the repository at this point in the history
  4. Fix contextually typed object literal proeprties that are not propert…

    …ies of the union type but are properties on of one of its constituant types
    mhegazy committed Oct 9, 2014
    Configuration menu
    Copy the full SHA
    927f04f View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2014

  1. Configuration menu
    Copy the full SHA
    9f43ac0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bacb9d0 View commit details
    Browse the repository at this point in the history
  3. Fixing merge conflicts

    danquirk committed Oct 10, 2014
    Configuration menu
    Copy the full SHA
    8ce1760 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f5a9fee View commit details
    Browse the repository at this point in the history
  5. 3 Configuration menu
    Copy the full SHA
    483afea View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4e02b9f View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2014

  1. Accepting new baselines

    ahejlsberg committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    c9a42c1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2ce627c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4442b45 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'unionTypes' into unionTypesLS

    Conflicts:
    	src/compiler/checker.ts
    mhegazy committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    04e5309 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #861 from Microsoft/unionTypesLS

    Lanugage Service support for union types
    mhegazy committed Oct 11, 2014
    Configuration menu
    Copy the full SHA
    eee1602 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2014

  1. 16 Configuration menu
    Copy the full SHA
    83d9aed View commit details
    Browse the repository at this point in the history
  2. Accepting new baselines

    ahejlsberg committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    a76a418 View commit details
    Browse the repository at this point in the history
  3. Addressing CR feedback

    ahejlsberg committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    869ee41 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' into unionTypes

    Conflicts:
    	src/compiler/checker.ts
    	src/compiler/types.ts
    	src/services/services.ts
    	tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
    	tests/baselines/reference/bestCommonTypeOfTuple.types
    	tests/baselines/reference/bestCommonTypeOfTuple2.types
    	tests/baselines/reference/castingTuple.errors.txt
    	tests/baselines/reference/contextualTypeWithTuple.errors.txt
    	tests/baselines/reference/genericCallWithTupleType.errors.txt
    	tests/baselines/reference/indexerWithTuple.types
    	tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt
    ahejlsberg committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    fc842b1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4f4f59a View commit details
    Browse the repository at this point in the history
  6. Merge branch 'master' into unionTypes

    Conflicts:
    	src/compiler/types.ts
    	src/services/services.ts
    mhegazy committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    f5cd414 View commit details
    Browse the repository at this point in the history