[Transforms] Merge master 08/09 #10263

yuit · 2016-08-10T21:26:11Z

No description provided.

…he expression of each `ExpressionWithTypeArguments` is an `EntityNameExpression`.

…ber (#10096)

This makes sure that a union type that includes a type parameter is still usable as the actual type that the type guard narrows to.

…cess to Maps.

When a property is declared in the constructor and on the prototype of an ES6 class, the property's symbol is discarded in favour of the method's symbol. That because the usual use for this pattern is to bind an instance function: `this.m = this.m.bind(this)`. In this case the type you want really is the method's type.

Previously it was using TypeFacts.All. But the constraint of an unconstrained type parameter is actually {}.

Limit "type guards as assertions" behavior

Add a helper function `getOrUpdateProperty` to prevent unprotected access to Maps.

…types path resolution errors (#9867) * Change the shape of the shim layer to support getAutomaticTypeDirectives * Change the key for looking up automatic type-directives * Update baselines from change look-up name of type-directives * Add @CurrentDirectory into the test * Update baselines * Fix linting error * Address PR: fix spelling mistake * Instead of return path of the type directive names just return type directive names

… not produce these files (#9233)

…uded in TSX attributes

The extra `else` caused a ton of test failures!

Don't allow properties inherited from Object to be automatically included in TSX attributes

* Treat namespaceExportDeclaration as declaration * Update baselines * wip - add tests * Add tests * Show "export namespace" for quick-info

Add .types extension

…so allow it to have an extension)

Allow "typings" in a package.json to be missing its extension

…ypes JSDoc supports null, undefined and never types

* Use ES7 term of ExponentiationExpression * Update timeout for mac OS * Address PR: add space

Unify representation of tuples and other generic types

routine update of dom libs

Return non-JsDocComment children for syntactic classification

Tolerate errors in config file

Fixes #10429 by improving the fix in #10096

* Properly emit await expression with yield expression * Add tests and update baselines * Move parsing await expression into parse unary-expression * Update incorrect comment

…ally-typed-type-parameters Instantiate this for contextually typed type parameters

…-resolves-to-module allowSyntheticDefaultImports resolves to modules instead of variables

Add error message

# Conflicts: # Gulpfile.ts # Jakefile.js # src/compiler/binder.ts # src/compiler/checker.ts # src/compiler/core.ts # src/compiler/diagnosticMessages.json # src/compiler/emitter.ts # src/compiler/parser.ts # src/compiler/program.ts # src/compiler/types.ts # src/compiler/utilities.ts # src/harness/compilerRunner.ts # src/harness/harness.ts # src/harness/projectsRunner.ts # src/harness/unittests/jsDocParsing.ts # src/harness/unittests/transpile.ts # tests/baselines/reference/classExpressionES63.js # tests/webTestServer.ts

rbuckton · 2016-08-26T22:05:31Z

@yuit can you take a look at the lint failure?

kpreisser · 2016-08-27T14:51:28Z

Hi,
sorry if this this a wrong place to ask, but I have a question about the merge operation of this pull request. It seems this PR (and the previous, #10182) were merged as "squash" commit instead of a merge commit, which means instead of retaining the original commits and then having a "merge" commit that merges the two branches, there is a single commit (with one parent commit instead of two) which contains all the changes, and the git history does not include the individual commits that have been merged.

However, I would have expected this to use a normal merge commit, because e.g. now if I want to merge the transforms branch into the master branch, I get a lot of Conflicts due to the squash commit (and I expected that the transforms branch would eventually be merged into the master branch).

Can you give me some insight about this, @yuit, @rbuckton? Thank you!

Andy Hanson and others added 30 commits August 2, 2016 06:18

Merge branch 'master' into no_ts_extension

2821d98

Improve error message

0f134ed

Remove SupportedExpressionWithTypeArguments type; just check that t…

91c9d76

…he expression of each `ExpressionWithTypeArguments` is an `EntityNameExpression`.

Fix bug

db44a71

Fix #10083 - allowSyntheticDefaultImports alters getExternalModuleMem…

0eeb9cb

…ber (#10096)

Use recursion, and fix error for undefined node

dc19223

Rename function

6814a9f

Fix lint error

7908257

Narrowing type parameter intersects w/narrowed types

4189b4d

This makes sure that a union type that includes a type parameter is still usable as the actual type that the type guard narrows to.

Don't allow ".d.ts" extension in an import either.

359c8b1

Add a helper function getOrUpdateProperty to prevent unprotected ac…

204f2c1

…cess to Maps.

Limit type guards as assertions to incomplete types in loops

7ab6e11

Accept new baselines

917d18a

Fix linting error

12eb57c

Use {} type facts for unconstrained type params

045b51a

Previously it was using TypeFacts.All. But the constraint of an unconstrained type parameter is actually {}.

Fix newline lint

38ee13c

Merge pull request #10118 from Microsoft/limitTypeGuardAssertions

14f0aa0

Limit "type guards as assertions" behavior

Test that declares conflicting method first

7205750

Merge pull request #10115 from Microsoft/export_specifiers_map

0a8afc9

Add a helper function `getOrUpdateProperty` to prevent unprotected access to Maps.

Remove unused reference files: these tests produce erros so they will…

18fb33d

… not produce these files (#9233)

Add string-literal completion test for jsdoc

e5973b8

Merge branch 'master' into jsdoc-string-literal-types

4c35296

Support other (new) literal types in jsdoc

3c32478

Don't allow properties inherited from Object to be automatically incl…

9947ac2

…uded in TSX attributes

Add new test baseline and delete else in binder

798be6f

The extra `else` caused a ton of test failures!

Merge pull request #10153 from Microsoft/tsx_toString

b54aec1

Don't allow properties inherited from Object to be automatically included in TSX attributes

Fix lint

8f638f7

Port PR #10016 to Master (#10100)

ceab31c

* Treat namespaceExportDeclaration as declaration * Update baselines * wip - add tests * Add tests * Show "export namespace" for quick-info

Kanchalai Tanglertsampan and others added 23 commits August 22, 2016 09:15

Add .types extension

05fef61

Properly guard for undefined in getTypeReferenceArity

4e56fc0

Add jsdoc nullable union test case to fourslash

2c814f4

Merge pull request #10478 from Microsoft/fixtypesRWC

bb6c6fd

Add .types extension

Fix class/interface merging issue + lint error

2013058

Allow "typings" in a package.json to be missing its extension (but al…

92eb8df

…so allow it to have an extension)

Merge pull request #10480 from Microsoft/typings_extension_is_optional

ec1f6b1

Allow "typings" in a package.json to be missing its extension

Merge pull request #10399 from Microsoft/jsdoc-never-undefined-null-t…

a013759

…ypes JSDoc supports null, undefined and never types

Contextually type this in getDeclFromSig, not checkThisExpr

5aafc2c

Update parser comment with es7 grammar (#10459)

4a58e68

* Use ES7 term of ExponentiationExpression * Update timeout for mac OS * Address PR: add space

Merge pull request #10466 from Microsoft/tupleTypeReferences

3fb0840

Unify representation of tuples and other generic types

Merge pull request #10441 from zhengbli/routineUpdate819

6f722b0

routine update of dom libs

Merge pull request #10407 from zhengbli/fixJsDocSyntacticClassification

d133b0e

Return non-JsDocComment children for syntactic classification

Merge pull request #10418 from zhengbli/tolerateConfigError

edbeab0

Tolerate errors in config file

allowSyntheticDefaultImports resolves to modules instead of variables

046b55e

Fixes #10429 by improving the fix in #10096

Rename getContextuallyTypedThisParameter to getContextualThisParameter

fc1d6a8

Fix 10472: Invalid emitted code for await expression (#10483)

36130ff

* Properly emit await expression with yield expression * Add tests and update baselines * Move parsing await expression into parse unary-expression * Update incorrect comment

Merge pull request #9746 from Microsoft/instantiate-this-for-contextu…

f028fa3

…ally-typed-type-parameters Instantiate this for contextually typed type parameters

Merge pull request #10486 from Microsoft/allowSyntheticDefaultImports…

93de502

…-resolves-to-module allowSyntheticDefaultImports resolves to modules instead of variables

change error message

590755b

Merge pull request #10446 from YuichiNukiyama/fix10351

ddb5a00

Add error message

Fix broken build from merging with master

371602c

Fix linting error

422097e

yuit merged commit a370908 into transforms Aug 26, 2016

yuit deleted the mergeMaster_08/09 branch August 26, 2016 22:51

kpreisser mentioned this pull request Sep 2, 2016

[Transforms] Merge master 09/01 #10679

Merged

microsoft locked and limited conversation to collaborators Jun 19, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Transforms] Merge master 08/09 #10263

[Transforms] Merge master 08/09 #10263

yuit commented Aug 10, 2016

rbuckton commented Aug 26, 2016

kpreisser commented Aug 27, 2016 •

edited

Loading

[Transforms] Merge master 08/09 #10263

[Transforms] Merge master 08/09 #10263

Conversation

yuit commented Aug 10, 2016

rbuckton commented Aug 26, 2016

kpreisser commented Aug 27, 2016 • edited Loading

kpreisser commented Aug 27, 2016 •

edited

Loading